diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-11 21:03:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-11 21:03:43 +1000 |
| commit | f0939c364ffe7dc377c4d7946360f99cb7fc867b (patch) | |
| tree | e0515ae74e737b2f8a0005467eed5394fea189ff | |
| parent | 1d72d4d9ff851160f7a24247686d88fef0e130dc (diff) | |
Add linux-next specific files for 20150611next-20150611
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 221 | ||||
| -rw-r--r-- | Next/Trees | 223 | ||||
| -rw-r--r-- | Next/merge.log | 13000 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 13449 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..5c2a561df2c3 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,221 @@ +Name SHA1 +---- ---- +origin e64f638483a21105c7ce330d543fa1f1c35b5bc7 +fixes b94d525e58dc9638dd3f98094cb468bcfb262039 +kbuild-current c517d838eb7d07bbe9507871fab3931deccff539 +arc-current e4140819dadc3624accac8294881bca8a3cba4ed +arm-current 0bbe6b5a73c00f8c8e7eb38fb86993f03cd64b70 +m68k-current b24f670b7f5b2058b95370caa9f104b3cefb9f1d +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-merge-mpe c65b99f046843d2455aa231747b5a07a999a9f3d +powerpc-merge c517d838eb7d07bbe9507871fab3931deccff539 +sparc c46a024ea5eb0165114dbbc8c82c29b7bcf66e71 +net 1b0ccfe54a6abd1bc4d7bdd1c33e61e2c58f72c7 +ipsec 31a418986a5852034d520a5bab546821ff1ccf3d +sound-current 132bd96bc56f9cafd24b71de389984d0e83a0956 +pci-current 552bc94ebeeb189d0ac682dae95cf05e6b72d7fd +wireless-drivers 38fe44e61a894f1c7b3e60b0614030271070ea53 +driver-core.current d4a4f75cd8f29cd9464a5a32e9224a91571d6649 +tty.current d4a4f75cd8f29cd9464a5a32e9224a91571d6649 +usb.current d4a4f75cd8f29cd9464a5a32e9224a91571d6649 +usb-gadget-fixes c94e289f195e0e13cf34d27f9338d28221a85751 +usb-serial-fixes df72d588c54dad57dabb3cc8a87475d8ed66d806 +staging.current d4a4f75cd8f29cd9464a5a32e9224a91571d6649 +char-misc.current e26081808edadfd257c6c9d81014e3b25e9a6118 +input-current 7f2ca8b55aeff1fe51ed3570200ef88a96060917 +crypto-current f858c7bcca8c20761a20593439fe998b4b67e86b +ide d681f1166919d6829083c069a83edcd59bfd5e34 +devicetree-current f76502aa9140ec338a59487218bf70a9c9e92b8f +rr-fixes f36963c9d3f6f415732710da3acdd8608a9fa0e5 +vfio-fixes db7d4d7f40215843000cb9d441c9149fd42ea36b +kselftest-fixes ba155e2d21f6bf05de86a78dbe5bfd8757604a65 +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +drm-intel-fixes 3f5f1554ee715639e78d9be87623ee82772537e0 +asm-generic 643165c8bbc8617d8222cb50c89e34fe64d226cf +arc 3596ba60b38332a8c633400de36a84472d79b8ba +arm 0271c4d252eec2f450425498b2c183c7cd628ad0 +arm-perf 74cf0bc75f1671b8da3b2e6ef7b2dc75cab0016a +arm-soc 52acc11e94828adc358a8e53a3e40bc73967a29c +at91 dd1f58f398fbd89dd13cbfac36521240b049ab64 +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +rpi 50b674b89355c9d400f9fc00451451412e4944fb +berlin 7f8ad9c26be930eb44b26db67257dbd91e0af8f7 +cortex-m e799b6f37e6ccd7b97e3e2df62a30f1c5b211290 +imx-mxs 5bfaa924477b7513a59d84a1b56d76dfae8dfc62 +keystone a6ba4234e474f1caebec211c949846ac2956a332 +mvebu 96a9fef8a7fa30523a4354e7dd9d891e99d40204 +omap b6d4b793e0136f583b9e0b0f4059438a3e79b0ad +omap-pending 30aa18d3bea5f9470af5aa48ab8df88bde97c795 +renesas 613915220fbcf65ce0620c79899b2477d82bc42d +samsung 7585f44e561e301f48b710ce80235152bc6409cb +sunxi 11f9fb71e1729539f339d32e8ece93ea3ebed145 +tegra a9460d4a7ed1d61577443997b6646fa4fffaafe2 +arm64 04d7e098f541769721d7511d56aea4b976fd29fd +blackfin d91e14b3b9e1d8e1d552f4d6aff45551bbb410b1 +c6x 3083ca2376a76072dc0071fb211de80b0ac44bd1 +cris 7a7c68de60cf459630d462507f27f7adddb0d579 +h8300 2ced81d358085ea7bbe9213241dba580212eced8 +hexagon 8914d7e857807e1e60975000cba3750c9b2643e8 +ia64 078550569eafc6631d333488045159badbeb911a +m68k 1214c525484cabb27ed37df936c3451682757263 +m68knommu ba155e2d21f6bf05de86a78dbe5bfd8757604a65 +metag 40346a0327fed526baeea701a707b65ceeea71ed +microblaze c4fa9a6ae285ec4777d0524a4ee9c9039a5a4c28 +mips a17cc7e49f751f0616ff12ee508db99fffbefc1d +nios2 1a70db49a735350f221959bf26e9a12f63a743bc +parisc-hd 4b470f120817a16ea28da6141ea6e3a3040b297b +powerpc-mpe 809fac67c8530704a214e2c476349692e2fb9299 +powerpc 65e7bb2a34fe7b5fc3ae4532308150c600188118 +fsl f1b3b4450dcbfd0098b6fc3b00f4880701550c83 +mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +s390 7c53fcb39fddb59a9e32c10e96133049ed90930b +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 5316a64ce518f850afb0fca322b85b6dff3cb59f +uml 6c684465587aab2a0d2712ee755c0164fa33efd1 +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa ba155e2d21f6bf05de86a78dbe5bfd8757604a65 +btrfs e082f56313f374d723b0366978ddb062c8fe79ea +ceph 84b54fefaa051ac625ada7740bb260a77c35b9b7 +cifs 843b06f1f0cb766641b7c6b1b3d9ca98db5f18ff +ecryptfs 6d65261a09adaa374c05de807f73a144d783669e +ext3 792352cb160e654f0b64182550ee702a790fe4d0 +ext4 a65579bdbb657957f6513232e80a525898aadecb +f2fs de6a8ec9822dbe2ce1f5a273cfac9e16032387e2 +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 780e2a3f06e7f46f2043608cb5adb4f91c636b29 +gfs2 86066914edff2316cbed63aac8a87d5001441a16 +jfs f7f31adf07d1c9e66c160e9bdd77e12531cd6996 +nfs 0d2a970d0ae55086520e1e58e572a7acd519429c +nfsd 185406191af59c693111735896f41bfe712f29a5 +overlayfs 3ed6b3b4255daa7fc17a769900e08a1ece777d3f +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs 3d99e3fe13d473ac4578c37f477a59b829530764 +ubifs 98fb1ffd8154890d7051750e61ff5548c3ee2ab2 +xfs 4ea79766168b64766d6c9fcdaa9fab83a6cfebcf +file-locks 7505256626b0b3d11ea5a3ec1a89046d07c3c366 +vfs b853a16176cf3e02c57e215743015614152c2428 +pci 4d5da4d918f7ef9929900a7994eb134c243f6114 +hid 4d4c484d0c59d192f95966e55d8013405bc749fb +i2c c3413f46e575c20858fda536b9e8627657fd6c1e +jdelvare-hwmon 2b30464a2c87e86ca4f63731012d08745154a4ea +dmi bec755ee10805d774c1b0978c0789ef061a26559 +hwmon-staging f6725ae2f1ae266589ab177461e308bb2f86f9ee +v4l-dvb 52d0f6e95987a4fc30713af350d196aaaf2da687 +kbuild f412fabbc164ca78f9184f75e737c1645153f9b4 +kconfig bfa76d49576599a4b9f9b7a71f23d73d6dcff735 +libata 72edb9faf1d59dd3fd96adb533f650e8b97343ce +pm 45423299db3ae5b9aa39a1b0ccf3fe3d2a1983b6 +idle a576d08d4eb2c2ca1320e0c9af41ea6383918848 +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +thermal e27f74ae45b3cf38991a44bdb4b0f4b1e50d4fcb +thermal-soc b89384e9e8c046a8a7221f38e02c3f8d6b445099 +ieee1394 d71e6a11737f4b3d857425a1d6f893231cbd1296 +dlm 2ab4bd8ea3a6954bc79a9bbeb291cd6c2d6213a7 +swiotlb 023600f192be3f5776336e2c61d577b551a1ca9c +slave-dma 040e7ee5ce25c6329cb9868f89d73e43bd89d8c6 +net-next c3eee1fb1d308564ada5f7ea57bc51efc6130b37 +ipsec-next 493be55ac3d81f9c32832237288eb397a9993d5d +wireless-drivers-next 49280625eb826ab07882e91fb84023a54317317f +bluetooth d446278c408bdebd4103090740ce908c5d6b5ab0 +rdma 5eb210433ffcf74b99230378c53ea64835a0dfcc +mtd e26081808edadfd257c6c9d81014e3b25e9a6118 +l2-mtd e5babdf928e5d0c432a8d4b99f20421ce14d1ab6 +crypto 42ea507fae1ac4b4af0d9d715ab56fa4de2a0341 +drm ae45577324d1f749c907840247d443696ac3bc7a +drm-panel 7351148e2f36eb474ac724bda7c4ff718fd77f23 +drm-intel bf546f8158e2df2656494a475e6235634121c87c +drm-tegra 535a65db484ff4e4654a037f2ea7e1ff21431b77 +drm-misc 0f5c41dbe96a7e9b233bec8a69e6125b122c440e +drm-exynos 7abddcd65bc0be8ef355117695b8ebc6f16776bf +drm-msm d22855673f2e9a55f77eea8ab1646994cb2114c2 +sound 8721fa692bc218df3f0ad30740baedf176a41f56 +sound-asoc ef36ac8223ffca01fa23e7541b8f1aa0a26bd28c +modules 6727bb9c6abe836d88191ce13bfdd7a53c245e15 +input e70b03071c5d43ea7a63b007a1c4bf285a2772d1 +block e4bb709481e621d2dccf9a68664603b91e4c3203 +device-mapper 64dde3311eac8136d646a69a8d34a32eb577a87c +pcmcia f2e6cf76751d479874216f989f6bef6da6e80119 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh 5fd26c7ecb32082745b0bd33c8e35badd1cb5a91 +kgdb 2d289f14f00a0da6bae7c8415fc8dd9d030458b8 +md 38f31b94147c97b195e8302e55335efc5babfff2 +mfd bdb2ad5f4b95a1602948095241d4e8d832bb5935 +backlight a7f6d457139389d0d40f3c8992bf78e2536ab2ba +battery f4ed950a63fc9590287f0f4fb0698e530b42b8a6 +omap_dss2 8dc0a56529f5d60bbb927049d48245b1a7989bf8 +regulator 680f8869c301feba7c2d89323cf7d575f46de411 +security 9fc2b4b436cff7d8403034676014f1be9d534942 +integrity 8d94eb9b5cff350ba170848c862ca0006d33d496 +selinux 9fc2b4b436cff7d8403034676014f1be9d534942 +lblnet b2776bf7149bddd1f4161f14f79520f17fc1d71d +watchdog e72cb910fd8d1ddf85b3512548013f3799544be2 +iommu 05eb388bbe3986dc753f8dc0c09246ff39f71b06 +dwmw2-iommu 4ed6a540fab8ea4388c1703b73ecfed68a2009d1 +vfio 20f300175a1e150dae231e21dfa1fc4c6fcf4db6 +osd 1fa3a002b2546c42c343c77c144871285896ced5 +jc_docs f8785d94fc4e93cacbdb930ec3654fc035a375ec +trivial 79ce48df755e6a5231cc1ac515e7988e1d715ce1 +audit 5c1390c9ffdaeb9f7e544cea3a1699a341cad1fb +devicetree ce32f859646bab2ed724393398b90aa50149bb44 +dt-rh 63a4aea556704acba1529df8f896ed65b93e66c1 +mailbox a612f89c516e924144c289188ca17f6ab3256bb9 +spi 13d24a118211ce7e61b3cbed722e8013cb9f5901 +tip bdf16a00fad79f0e811cb755f564281f55d1b35d +clockevents 645d558b1cd5d489cbeb23c37a4b9dd7d113f329 +edac fa2ce64f85be48003e8c88efcb8c3d7e4d0939ff +edac-amd 31fec261002e271b02c5d74aaf842290d00296ed +irqchip a8bcdc32fafbeb236910e6ddc0161003a458ffc1 +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace a497adb45b8691f7e477e711a1a4bd54748d64fe +rcu 66709041ffca3676479a086b16c3b8b6965b1a29 +kvm e80a4a9426adeaa34c009bc0bc61365e0580bf01 +kvm-arm 3520469d65f26a1cd2f610f5d5de976f78db74fe +kvm-ppc b79013b2449c23f1f505bdf39c5a6c330338b244 +kvms390 ea2cdd27dce66dc498c623adacd807ea3a350443 +xen-tip ffb7dbed47da6ac4460b606a3feee295bbe4d9e2 +percpu 4c907baf36d8339f393bb576d0bab29194d0e6ad +workqueues 402dd89d6cdbeeaab42b810542b487017725c628 +drivers-x86 9330dcdd918a5724af8321127a19a1b171df6bab +chrome-platform 96cba9b00e297303774bec59e192064d20adeb3d +regmap 385faaeab062b55e647c4d6f7e75b6f49bd95fd5 +hsi 1269594a93bb14f70c357de4dcb3183bfd2142b4 +leds 589fca16c14adec7ebeb601e22850826e18b8f8d +ipmi 10120805c0414460b9a96f5a0a14370012f95652 +driver-core 0e6c861f73ec42ab5c89fda9892f2173c7aaf6cf +tty 00fda1682efdbd62a20a8a21aee52d994c323c7f +usb b0a252ed983b8e6339e01749029749adbaa890de +usb-gadget e18b7975c885bc3a938b9a76daf32957ea0235fa +usb-serial f05b7cb6f2beed0869669cc4748341560eba2aef +staging 6394d6d01bf0881823522f37601cbf880bc61087 +char-misc 00465f4c84867975e76fb5fb20f809f3f803e2c3 +extcon f8df88081183bd4d3c461c617c3519445eb85642 +kdbus cf15adc8b4810c8e8f84bca9300c553d968feef3 +cgroup 4a705c5c786dc7f85051ed262bb05a4ca275dded +scsi 641c43cc6909d949f7c630a5208e76ffbb236521 +target-updates a6fd1b94e96414c4d860b4b7f628acad8beeb3dc +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +pinctrl 323de9efdf3e75d1dfb48003a52e59d6d9d4c7a5 +vhost fa5f6add30c7094da7738b6744b5f6ce454475f8 +remoteproc 172e6ab1caffcd2dd2910b44d88d096f2c6985fa +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio 2b528fff0905497c96566d671d47f2bbf3ae295c +dma-mapping 5ebe6afaf0057ac3eaeb98defd5456894b446d22 +pwm cccb94543c8299e0bc7564cc6f8b26e0f15bafde +dma-buf 5136629dc5a19701746abd7c8ad98ce0b84dda1d +userns c97648cb2f34661d1f48bb62a9acefb11b85f866 +ktest 7c2c49eceb79eb4738f38a00270830057b5bfb76 +clk 8c9a8a8f71f43e56d35524fa17646ce45c2f7fe6 +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +aio 5f785de588735306ec4d7c875caf9d28481c8b21 +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +kselftest 390db010c96091bd3bd0c5d6c0b667d22290ef41 +y2038 ed8c2241c1ae1b64e4a783ae7a2c685c93142a8d +luto-misc a6c5170d1edea97c538c81e377e56c7b5c5b7e63 +access_once bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 +livepatching 507a76d5f7014f945e21d614394f24dacb2f3711 +coresight 486ea46dfc88f4df79e9bf9e77c8579c1ff29152 +rtc ce7ffc74836c859f1ca1b0c518ae0f25c3ccbf88 +init 154df8aa70571106eb1e90ce93cf7ca3ed589f58 +akpm-current 4ace53bb3d31bb1e75d3501bd31b3f1e8585a115 +akpm fa4e2c73ae6575089cc0724666bf40daa5430a4e diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..b293147e10b6 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,223 @@ +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://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/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 +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-fixes +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +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 +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 +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +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 +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 +devicetree-current git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +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 +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +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://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/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 +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-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 +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +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.rocketboards.org/linux-socfpga-next.git#nios2-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.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 +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/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.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 +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 +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +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 +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +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 +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +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 +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-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 +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#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 +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 +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +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 +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://neil.brown.name/md#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.infradead.org/battery-2.6.git#master +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 +selinux git git://git.infradead.org/users/pcmoore/selinux#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet#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 +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-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/glikely/linux.git#devicetree/next +dt-rh 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 +tiny git git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git#tiny/next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://github.com/agraf/linux-2.6.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 +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.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/cooloney/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 +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 +kdbus git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#kdbus +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 +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 +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.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://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.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 +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +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 +access_once 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 +init git git://git.kernel.org/pub/scm/linux/kernel/git/paulg/init.git#init-v4.1-rc6 +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..7c4e41e55559 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,13000 @@ +$ date +Thursday 11 June 08:47:12 AEST 2015 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at e64f638483a2 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input +Merging origin/master (e64f638483a2 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge origin/master +Already up-to-date. +Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (c517d838eb7d Linux 4.0-rc1) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (0bbe6b5a73c0 ARM: 8388/1: tcm: Don't crash when TCM banks are protected by TrustZone) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/kernel/tcm.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++-- + arch/arm/vdso/Makefile | 18 +++++---- + 2 files changed, 112 insertions(+), 10 deletions(-) +Merging m68k-current/for-linus (b24f670b7f5b m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) +$ git merge mips-fixes/mips-fixes +Already up-to-date. +Merging powerpc-merge-mpe/fixes (c65b99f04684 Linux 4.1-rc6) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging powerpc-merge/merge (c517d838eb7d Linux 4.0-rc1) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (c46a024ea5eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge sparc/master +Already up-to-date. +Merging net/master (1b0ccfe54a6a Revert "ipv6: Fix protocol resubmission") +$ git merge net/master +Merge made by the 'recursive' strategy. + net/ipv6/ip6_input.c | 8 +++----- + net/wireless/wext-compat.c | 2 ++ + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging ipsec/master (31a418986a58 xen: netback: read hotplug script once at start of day.) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (132bd96bc56f ALSA: hda - fix number of devices query on hotplug) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/hda_codec.c | 2 +- + sound/usb/quirks.c | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging pci-current/for-linus (552bc94ebeeb PCI: Preserve resource size during alignment reordering) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-drivers/master (38fe44e61a89 Merge tag 'iwlwifi-for-kalle-2015-05-28' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) +$ git merge wireless-drivers/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (d4a4f75cd8f2 Linux 4.1-rc7) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (d4a4f75cd8f2 Linux 4.1-rc7) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (d4a4f75cd8f2 Linux 4.1-rc7) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (c94e289f195e usb: gadget: remove incorrect __init/__exit annotations) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (df72d588c54d USB: cp210x: add ID for HubZ dual ZigBee and Z-Wave dongle) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (d4a4f75cd8f2 Linux 4.1-rc7) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (e26081808eda Linux 4.1-rc4) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (7f2ca8b55aef Input: synaptics - add min/max quirk for Lenovo S540) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (f858c7bcca8c crypto: algif_aead - Disable AEAD user-space for now) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) +$ git merge ide/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (f36963c9d3f6 cpumask_set_cpu_local_first => cpumask_local_spread, lament) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (db7d4d7f4021 vfio: Fix runaway interruptible timeout) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (ba155e2d21f6 Linux 4.1-rc5) +$ 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 drm-intel-fixes/for-linux-next-fixes (3f5f1554ee71 drm/i915: Fix DDC probe for passive adapters) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_i2c.c | 20 +++++++++++++++++--- + drivers/gpu/drm/i915/intel_sdvo.c | 2 +- + 2 files changed, 18 insertions(+), 4 deletions(-) +Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (3596ba60b383 ARC: [axs101] Add missing __init annotations) +$ git merge arc/for-next +Auto-merging arch/arc/plat-sim/platform.c +Auto-merging arch/arc/plat-sim/Makefile +Removing arch/arc/plat-arcfpga/smp.c +Removing arch/arc/plat-arcfpga/include/plat/smp.h +Removing arch/arc/plat-arcfpga/Kconfig +Auto-merging arch/arc/boot/dts/nsim_700.dts +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arc/axs101.txt | 7 + + MAINTAINERS | 7 + + arch/arc/Kconfig | 35 ++- + arch/arc/Makefile | 9 +- + arch/arc/boot/dts/Makefile | 2 +- + arch/arc/boot/dts/axc001.dtsi | 79 ++++++ + arch/arc/boot/dts/axs101.dts | 21 ++ + arch/arc/boot/dts/axs10x_mb.dtsi | 241 ++++++++++++++++++ + arch/arc/boot/dts/{angel4.dts => nsim_700.dts} | 2 +- + arch/arc/configs/axs101_defconfig | 111 +++++++++ + arch/arc/configs/nsim_700_defconfig | 7 +- + arch/arc/configs/nsimosci_defconfig | 5 +- + arch/arc/configs/tb10x_defconfig | 3 +- + arch/arc/include/asm/arcregs.h | 4 +- + arch/arc/include/asm/cacheflush.h | 4 +- + arch/arc/include/asm/dma-mapping.h | 31 +-- + arch/arc/include/asm/processor.h | 37 ++- + arch/arc/include/uapi/asm/page.h | 2 +- + arch/arc/kernel/devtree.c | 2 + + arch/arc/kernel/head.S | 2 + + arch/arc/kernel/perf_event.c | 6 +- + arch/arc/kernel/setup.c | 17 +- + arch/arc/kernel/smp.c | 2 +- + arch/arc/kernel/stacktrace.c | 18 +- + arch/arc/kernel/time.c | 61 +---- + arch/arc/mm/cache_arc700.c | 12 +- + arch/arc/mm/dma.c | 12 +- + arch/arc/mm/tlb.c | 8 +- + arch/arc/plat-arcfpga/Kconfig | 33 --- + arch/arc/plat-arcfpga/include/plat/smp.h | 118 --------- + arch/arc/plat-arcfpga/smp.c | 186 -------------- + arch/arc/plat-axs10x/Kconfig | 35 +++ + arch/arc/plat-axs10x/Makefile | 9 + + arch/arc/plat-axs10x/axs10x.c | 298 +++++++++++++++++++++++ + arch/arc/plat-sim/Kconfig | 14 ++ + arch/arc/{plat-arcfpga => plat-sim}/Makefile | 3 - + arch/arc/{plat-arcfpga => plat-sim}/platform.c | 17 +- + 37 files changed, 917 insertions(+), 543 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arc/axs101.txt + create mode 100644 arch/arc/boot/dts/axc001.dtsi + create mode 100644 arch/arc/boot/dts/axs101.dts + create mode 100644 arch/arc/boot/dts/axs10x_mb.dtsi + rename arch/arc/boot/dts/{angel4.dts => nsim_700.dts} (97%) + create mode 100644 arch/arc/configs/axs101_defconfig + delete mode 100644 arch/arc/plat-arcfpga/Kconfig + delete mode 100644 arch/arc/plat-arcfpga/include/plat/smp.h + delete mode 100644 arch/arc/plat-arcfpga/smp.c + create mode 100644 arch/arc/plat-axs10x/Kconfig + create mode 100644 arch/arc/plat-axs10x/Makefile + create mode 100644 arch/arc/plat-axs10x/axs10x.c + create mode 100644 arch/arc/plat-sim/Kconfig + rename arch/arc/{plat-arcfpga => plat-sim}/Makefile (75%) + rename arch/arc/{plat-arcfpga => plat-sim}/platform.c (70%) +Merging arm/for-next (0271c4d252ee Merge branch 'for-arm-soc' into for-next) +$ git merge arm/for-next +Auto-merging kernel/events/core.c +Auto-merging include/linux/perf_event.h +Auto-merging include/clocksource/timer-sp804.h +Auto-merging drivers/irqchip/irq-sa11x0.c +Auto-merging drivers/clocksource/timer-sp804.c +Auto-merging drivers/clocksource/timer-sp.h +Removing arch/arm/mach-tegra/headsmp.S +Auto-merging arch/arm/mach-pxa/lubbock.c +Removing arch/arm/mach-hisi/headsmp.S +Auto-merging arch/arm/mach-exynos/suspend.c +Removing arch/arm/mach-bcm/headsmp-brcmstb.S +Removing arch/arm/mach-bcm/brcmstb.h +Removing arch/arm/kernel/perf_event_cpu.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/booting-without-of.txt | 4 + + arch/arm/Kconfig | 34 +- + arch/arm/Kconfig.debug | 1 + + arch/arm/Makefile | 4 + + arch/arm/boot/compressed/Makefile | 2 + + arch/arm/boot/compressed/head.S | 4 +- + arch/arm/boot/dts/exynos5260-xyref5260.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3517.dts | 2 +- + arch/arm/common/Makefile | 1 - + arch/arm/common/mcpm_entry.c | 281 ++++++-------- + arch/arm/common/mcpm_head.S | 2 +- + arch/arm/include/asm/assembler.h | 17 +- + arch/arm/include/asm/cacheflush.h | 7 + + arch/arm/include/asm/cmpxchg.h | 67 ++-- + arch/arm/include/asm/entry-macro-multi.S | 4 +- + arch/arm/include/asm/io.h | 52 ++- + arch/arm/include/asm/mach/arch.h | 2 +- + arch/arm/include/asm/mcpm.h | 73 ++-- + arch/arm/include/asm/memory.h | 16 - + arch/arm/include/asm/module.h | 12 +- + arch/arm/include/asm/perf_event.h | 7 + + arch/arm/include/asm/pmu.h | 19 +- + arch/arm/include/asm/proc-fns.h | 7 - + arch/arm/include/asm/smp.h | 3 +- + arch/arm/include/asm/system_info.h | 1 + + arch/arm/include/asm/unified.h | 2 - + arch/arm/kernel/Makefile | 5 +- + arch/arm/kernel/entry-armv.S | 12 +- + arch/arm/kernel/entry-common.S | 6 +- + arch/arm/kernel/entry-ftrace.S | 2 +- + arch/arm/kernel/entry-v7m.S | 13 +- + arch/arm/kernel/head-nommu.S | 27 +- + arch/arm/kernel/head.S | 52 ++- + arch/arm/kernel/module-plts.c | 183 +++++++++ + arch/arm/kernel/module.c | 32 +- + arch/arm/kernel/module.lds | 4 + + arch/arm/kernel/perf_event.c | 408 ++++++++++++++++++-- + arch/arm/kernel/perf_event_cpu.c | 421 --------------------- + arch/arm/kernel/perf_event_v6.c | 49 ++- + arch/arm/kernel/perf_event_v7.c | 129 +++---- + arch/arm/kernel/perf_event_xscale.c | 32 +- + arch/arm/kernel/setup.c | 30 +- + arch/arm/kernel/sleep.S | 2 +- + arch/arm/kernel/smp.c | 10 +- + arch/arm/kernel/traps.c | 8 - + arch/arm/kvm/interrupts.S | 2 +- + arch/arm/lib/call_with_stack.S | 2 +- + arch/arm/mach-bcm/Makefile | 2 +- + arch/arm/mach-bcm/brcmstb.h | 19 - + arch/arm/mach-bcm/headsmp-brcmstb.S | 33 -- + arch/arm/mach-bcm/platsmp-brcmstb.c | 4 +- + arch/arm/mach-berlin/headsmp.S | 6 - + arch/arm/mach-berlin/platsmp.c | 3 +- + arch/arm/mach-davinci/da850.c | 1 + + arch/arm/mach-davinci/include/mach/da8xx.h | 2 +- + arch/arm/mach-exynos/suspend.c | 8 +- + arch/arm/mach-hisi/Makefile | 2 +- + arch/arm/mach-hisi/core.h | 1 - + arch/arm/mach-hisi/headsmp.S | 16 - + arch/arm/mach-hisi/platmcpm.c | 133 +++---- + arch/arm/mach-hisi/platsmp.c | 4 +- + arch/arm/mach-imx/clk-imx6sx.c | 4 +- + arch/arm/mach-imx/headsmp.S | 1 - + arch/arm/mach-integrator/integrator_ap.c | 1 - + arch/arm/mach-iop13xx/include/mach/time.h | 2 +- + arch/arm/mach-ixp4xx/include/mach/platform.h | 2 +- + arch/arm/mach-keystone/keystone.c | 41 +- + arch/arm/mach-keystone/platsmp.c | 13 - + arch/arm/mach-ks8695/include/mach/hardware.h | 2 +- + arch/arm/mach-lpc32xx/clock.c | 5 +- + arch/arm/mach-mvebu/headsmp-a9.S | 1 - + arch/arm/mach-nspire/nspire.c | 2 - + arch/arm/mach-omap1/board-nokia770.c | 2 +- + arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 12 +- + arch/arm/mach-omap2/gpmc-onenand.c | 4 +- + arch/arm/mach-omap2/hsmmc.c | 2 +- + arch/arm/mach-omap2/omap_device.c | 24 +- + arch/arm/mach-omap2/opp2430_data.c | 4 +- + arch/arm/mach-omap2/sdrc2xxx.c | 2 +- + arch/arm/mach-omap2/sram242x.S | 2 +- + arch/arm/mach-omap2/sram243x.S | 2 +- + arch/arm/mach-prima2/headsmp.S | 1 - + arch/arm/mach-pxa/eseries.c | 1 + + arch/arm/mach-pxa/lubbock.c | 1 + + arch/arm/mach-pxa/mp900.c | 2 +- + arch/arm/mach-pxa/tosa.c | 1 + + arch/arm/mach-realview/core.c | 13 +- + arch/arm/mach-rockchip/core.h | 1 - + arch/arm/mach-rockchip/headsmp.S | 8 - + arch/arm/mach-rockchip/platsmp.c | 5 +- + arch/arm/mach-sa1100/Makefile | 2 +- + arch/arm/mach-sa1100/generic.c | 37 ++ + arch/arm/mach-shmobile/common.h | 1 - + arch/arm/mach-shmobile/headsmp-scu.S | 4 +- + arch/arm/mach-shmobile/headsmp.S | 7 - + arch/arm/mach-shmobile/platsmp-apmu.c | 2 +- + arch/arm/mach-socfpga/core.h | 1 - + arch/arm/mach-socfpga/headsmp.S | 5 - + arch/arm/mach-socfpga/platsmp.c | 2 +- + arch/arm/mach-tegra/Makefile | 2 +- + arch/arm/mach-tegra/headsmp.S | 12 - + arch/arm/mach-tegra/reset.c | 2 +- + arch/arm/mach-tegra/reset.h | 1 - + arch/arm/mach-versatile/core.c | 12 +- + arch/arm/mach-zynq/common.h | 2 - + arch/arm/mach-zynq/headsmp.S | 5 - + arch/arm/mach-zynq/platsmp.c | 5 +- + arch/arm/mm/Kconfig | 24 +- + arch/arm/mm/Makefile | 3 + + arch/arm/mm/cache-l2x0.c | 87 +++-- + arch/arm/mm/dma-mapping.c | 32 +- + arch/arm/mm/mmu.c | 153 ++++---- + arch/arm/mm/nommu.c | 9 - + arch/arm/mm/proc-v7-2level.S | 12 +- + arch/arm/mm/proc-v7-3level.S | 14 +- + arch/arm/mm/proc-v7.S | 184 +++++---- + arch/arm/mm/proc-v7m.S | 2 +- + arch/arm/mm/pv-fixup-asm.S | 88 +++++ + arch/arm/plat-orion/common.c | 6 +- + arch/sh/kernel/cpu/sh4a/clock-sh7734.c | 3 +- + arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 4 +- + arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 4 +- + arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 4 +- + arch/sh/kernel/cpu/sh4a/clock-shx3.c | 4 +- + drivers/clk/clk-s2mps11.c | 4 +- + drivers/clk/clkdev.c | 83 ++-- + drivers/clocksource/Kconfig | 6 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/timer-integrator-ap.c | 3 +- + .../arm_timer.h => drivers/clocksource/timer-sp.h | 5 - + .../clocksource/timer-sp804.c | 12 +- + drivers/cpuidle/cpuidle-big_little.c | 8 +- + drivers/irqchip/Makefile | 1 + + .../irq.c => drivers/irqchip/irq-sa11x0.c | 85 ++--- + .../clocksource/timer-sp804.h | 5 + + include/linux/clk.h | 27 +- + include/linux/clkdev.h | 6 +- + include/linux/irqchip/irq-sa11x0.h | 17 + + include/linux/perf_event.h | 5 + + include/soc/sa1100/pwer.h | 15 + + kernel/events/core.c | 8 +- + sound/soc/sh/migor.c | 3 +- + 142 files changed, 1882 insertions(+), 1597 deletions(-) + create mode 100644 arch/arm/kernel/module-plts.c + create mode 100644 arch/arm/kernel/module.lds + delete mode 100644 arch/arm/kernel/perf_event_cpu.c + delete mode 100644 arch/arm/mach-bcm/brcmstb.h + delete mode 100644 arch/arm/mach-bcm/headsmp-brcmstb.S + delete mode 100644 arch/arm/mach-hisi/headsmp.S + delete mode 100644 arch/arm/mach-tegra/headsmp.S + create mode 100644 arch/arm/mm/pv-fixup-asm.S + rename arch/arm/include/asm/hardware/arm_timer.h => drivers/clocksource/timer-sp.h (93%) + rename arch/arm/common/timer-sp.c => drivers/clocksource/timer-sp804.c (97%) + rename arch/arm/mach-sa1100/irq.c => drivers/irqchip/irq-sa11x0.c (64%) + rename arch/arm/include/asm/hardware/timer-sp.h => include/clocksource/timer-sp804.h (85%) + create mode 100644 include/linux/irqchip/irq-sa11x0.h + create mode 100644 include/soc/sa1100/pwer.h +Merging arm-perf/for-next/perf (74cf0bc75f16 arm: perf: unify perf_event{,_cpu}.c) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (52acc11e9482 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Resolved 'arch/arm/mach-socfpga/core.h' using previous resolution. +Removing include/soc/at91/at91rm9200_sdramc.h +Removing arch/arm64/boot/dts/skeleton.dtsi +Auto-merging arch/arm/mach-zynq/common.h +Auto-merging arch/arm/mach-tegra/reset.h +Auto-merging arch/arm/mach-socfpga/platsmp.c +Auto-merging arch/arm/mach-socfpga/headsmp.S +Auto-merging arch/arm/mach-socfpga/core.h +CONFLICT (content): Merge conflict in arch/arm/mach-socfpga/core.h +Auto-merging arch/arm/mach-pxa/tosa.c +Auto-merging arch/arm/mach-pxa/lubbock.c +Auto-merging arch/arm/mach-pxa/eseries.c +Removing arch/arm/mach-pxa/clock.h +Removing arch/arm/mach-pxa/clock.c +Removing arch/arm/mach-pxa/clock-pxa3xx.c +Removing arch/arm/mach-pxa/clock-pxa2xx.c +Removing arch/arm/mach-omap2/board-overo.c +Removing arch/arm/mach-omap2/board-omap3beagle.c +Removing arch/arm/mach-omap2/board-cm-t35.c +Removing arch/arm/mach-omap1/include/mach/entry-macro.S +Auto-merging arch/arm/mach-omap1/board-nokia770.c +Removing arch/arm/mach-imx/mach-cpuimx35.c +Removing arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c +Auto-merging arch/arm/mach-bcm/Makefile +Removing arch/arm/mach-at91/sam9_smc.h +Removing arch/arm/mach-at91/sam9_smc.c +Removing arch/arm/mach-at91/include/mach/at91sam9_smc.h +Removing arch/arm/mach-at91/include/mach/at91rm9200_mc.h +Removing arch/arm/mach-at91/include/mach/at91_ramc.h +Removing arch/arm/mach-at91/Makefile.boot +Auto-merging arch/arm/boot/dts/socfpga_arria10_socdk.dtsi +Removing arch/arm/boot/dts/kizbox.dts +Removing arch/arm/boot/dts/dove-cm-a510.dts +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f1273c6943cf] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/CCN.txt | 17 +- + Documentation/arm/stm32/overview.txt | 32 + + Documentation/arm/stm32/stm32f429-overview.txt | 22 + + Documentation/devicetree/bindings/arm/arm-boards | 66 + + .../devicetree/bindings/arm/atmel-at91.txt | 2 +- + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 31 +- + .../devicetree/bindings/arm/bcm/brcm,bcm63138.txt | 76 ++ + Documentation/devicetree/bindings/arm/cci.txt | 4 +- + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + Documentation/devicetree/bindings/arm/fsl.txt | 3 + + .../devicetree/bindings/arm/marvell,berlin.txt | 100 +- + Documentation/devicetree/bindings/arm/scu.txt | 25 + + .../devicetree/bindings/arm/ux500/boards.txt | 83 ++ + .../devicetree/bindings/clock/marvell,berlin.txt | 31 + + .../bindings/fuse/nvidia,tegra20-fuse.txt | 2 +- + .../memory-controllers/nvidia,tegra-mc.txt | 84 +- + .../bindings/memory-controllers/tegra-emc.txt | 374 ++++++ + Documentation/devicetree/bindings/mfd/mfd.txt | 41 + + .../bindings/misc/nvidia,tegra20-apbmisc.txt | 2 + + .../devicetree/bindings/pci/xilinx-pcie.txt | 2 +- + .../devicetree/bindings/pinctrl/berlin,pinctrl.txt | 43 + + .../devicetree/bindings/reset/berlin,reset.txt | 23 + + .../bindings/reset/brcm,bcm63138-pmb.txt | 19 + + .../devicetree/bindings/soc/sunxi/sram.txt | 72 ++ + Documentation/devicetree/bindings/spi/sh-msiof.txt | 2 +- + .../bindings/timer/cadence,ttc-timer.txt | 4 + + .../devicetree/bindings/usb/atmel-usb.txt | 25 + + .../devicetree/bindings/vendor-prefixes.txt | 6 + + MAINTAINERS | 31 + + arch/arm/Kconfig | 72 +- + arch/arm/Kconfig.debug | 53 +- + arch/arm/Makefile | 4 + + arch/arm/arm-soc-for-next-contents.txt | 237 ++++ + arch/arm/boot/dts/Makefile | 51 +- + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 532 ++++++++ + arch/arm/boot/dts/am335x-bone-common.dtsi | 66 + + arch/arm/boot/dts/am335x-evm.dts | 81 ++ + arch/arm/boot/dts/am3517.dtsi | 11 + + arch/arm/boot/dts/am437x-gp-evm.dts | 144 ++- + arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +- + arch/arm/boot/dts/armada-370-db.dts | 2 +- + arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 357 ++++++ + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 2 +- + arch/arm/boot/dts/armada-370-xp.dtsi | 2 - + arch/arm/boot/dts/armada-370.dtsi | 4 + + arch/arm/boot/dts/armada-375-db.dts | 2 +- + arch/arm/boot/dts/armada-375.dtsi | 6 +- + arch/arm/boot/dts/armada-385-db-ap.dts | 2 +- + arch/arm/boot/dts/armada-385-linksys-caiman.dts | 114 ++ + arch/arm/boot/dts/armada-385-linksys-cobra.dts | 114 ++ + arch/arm/boot/dts/armada-385-linksys.dtsi | 332 +++++ + arch/arm/boot/dts/armada-388-db.dts | 2 +- + arch/arm/boot/dts/armada-388-gp.dts | 2 +- + arch/arm/boot/dts/armada-388-rd.dts | 2 +- + arch/arm/boot/dts/armada-38x.dtsi | 8 +- + arch/arm/boot/dts/armada-398-db.dts | 2 +- + arch/arm/boot/dts/armada-39x.dtsi | 6 +- + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 2 +- + arch/arm/boot/dts/armada-xp-db.dts | 2 +- + arch/arm/boot/dts/armada-xp-gp.dts | 2 +- + arch/arm/boot/dts/armada-xp-synology-ds414.dts | 2 +- + arch/arm/boot/dts/armada-xp.dtsi | 8 + + arch/arm/boot/dts/armv7-m.dtsi | 6 + + arch/arm/boot/dts/at91-kizbox.dts | 159 +++ + arch/arm/boot/dts/at91-kizbox2.dts | 216 ++++ + arch/arm/boot/dts/at91-kizboxmini.dts | 129 ++ + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 33 +- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 25 + + arch/arm/boot/dts/at91rm9200.dtsi | 6 +- + arch/arm/boot/dts/at91sam9260.dtsi | 4 +- + arch/arm/boot/dts/at91sam9261.dtsi | 4 +- + arch/arm/boot/dts/at91sam9263.dtsi | 4 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 8 +- + arch/arm/boot/dts/at91sam9n12.dtsi | 5 +- + arch/arm/boot/dts/at91sam9rlek.dts | 6 - + arch/arm/boot/dts/at91sam9x5.dtsi | 56 +- + arch/arm/boot/dts/axp209.dtsi | 5 - + arch/arm/boot/dts/bcm-cygnus.dtsi | 12 + + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 +- + arch/arm/boot/dts/bcm2835-rpi-b.dts | 4 +- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 8 +- + arch/arm/boot/dts/bcm2835.dtsi | 13 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 96 ++ + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 83 ++ + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 6 + + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 119 ++ + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 127 ++ + arch/arm/boot/dts/bcm63138.dtsi | 43 + + arch/arm/boot/dts/bcm7445-bcm97445svmb.dts | 23 + + arch/arm/boot/dts/bcm7445.dtsi | 59 + + arch/arm/boot/dts/bcm958300k.dts | 16 + + arch/arm/boot/dts/bcm963138dvt.dts | 12 + + arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts | 34 +- + arch/arm/boot/dts/berlin2.dtsi | 124 +- + arch/arm/boot/dts/berlin2cd-google-chromecast.dts | 34 +- + arch/arm/boot/dts/berlin2cd.dtsi | 100 +- + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 34 +- + arch/arm/boot/dts/berlin2q.dtsi | 154 ++- + arch/arm/boot/dts/cx92755.dtsi | 17 + + arch/arm/boot/dts/cx92755_equinox.dts | 4 + + arch/arm/boot/dts/dove-cm-a510.dts | 38 - + arch/arm/boot/dts/dove-cm-a510.dtsi | 195 +++ + arch/arm/boot/dts/dove-sbc-a510.dts | 182 +++ + arch/arm/boot/dts/dove.dtsi | 40 +- + arch/arm/boot/dts/emev2-kzm9d.dts | 4 +- + arch/arm/boot/dts/integrator.dtsi | 4 +- + arch/arm/boot/dts/kirkwood-b3.dts | 2 +- + arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +- + arch/arm/boot/dts/kirkwood-dir665.dts | 2 +- + arch/arm/boot/dts/kirkwood-dreamplug.dts | 2 +- + arch/arm/boot/dts/kirkwood-lsxl.dtsi | 2 +- + arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 2 +- + arch/arm/boot/dts/kirkwood-netxbig.dtsi | 2 +- + arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 2 +- + arch/arm/boot/dts/kirkwood-rd88f6192.dts | 2 +- + arch/arm/boot/dts/kirkwood-synology.dtsi | 2 +- + arch/arm/boot/dts/kirkwood-t5325.dts | 2 +- + arch/arm/boot/dts/kirkwood-ts219.dtsi | 2 +- + arch/arm/boot/dts/kizbox.dts | 150 --- + arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 157 +++ + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 162 +++ + arch/arm/boot/dts/lpc18xx.dtsi | 114 ++ + arch/arm/boot/dts/lpc4350-hitex-eval.dts | 45 + + arch/arm/boot/dts/lpc4350.dtsi | 39 + + arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 41 + + arch/arm/boot/dts/lpc4357.dtsi | 39 + + arch/arm/boot/dts/mt8127.dtsi | 8 +- + arch/arm/boot/dts/mt8135-pinfunc.h | 1302 ++++++++++++++++++++ + arch/arm/boot/dts/mt8135.dtsi | 29 + + arch/arm/boot/dts/omap3-evm-common.dtsi | 1 + + arch/arm/boot/dts/omap3-gta04.dtsi | 37 + + arch/arm/boot/dts/omap3-ldp.dts | 18 +- + arch/arm/boot/dts/omap5-uevm.dts | 14 +- + arch/arm/boot/dts/pxa27x.dtsi | 46 +- + arch/arm/boot/dts/pxa2xx.dtsi | 7 +- + arch/arm/boot/dts/pxa3xx.dtsi | 29 +- + arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 100 ++ + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 136 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 175 ++- + arch/arm/boot/dts/qcom-msm8660.dtsi | 5 + + arch/arm/boot/dts/qcom-pm8841.dtsi | 18 + + arch/arm/boot/dts/qcom-pm8941.dtsi | 133 +- + arch/arm/boot/dts/qcom-pma8084.dtsi | 92 ++ + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +- + arch/arm/boot/dts/r8a73a4.dtsi | 11 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- + arch/arm/boot/dts/r8a7740.dtsi | 10 +- + arch/arm/boot/dts/r8a7778-bockw-reference.dts | 2 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 4 +- + arch/arm/boot/dts/r8a7778.dtsi | 2 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 6 +- + arch/arm/boot/dts/r8a7779.dtsi | 2 +- + arch/arm/boot/dts/r8a7790-lager.dts | 4 +- + arch/arm/boot/dts/r8a7790.dtsi | 66 +- + arch/arm/boot/dts/r8a7791-henninger.dts | 2 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 4 +- + arch/arm/boot/dts/r8a7791.dtsi | 79 +- + arch/arm/boot/dts/r8a7794.dtsi | 45 + + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 44 +- + arch/arm/boot/dts/rk3066a.dtsi | 44 +- + arch/arm/boot/dts/rk3188-radxarock.dts | 45 +- + arch/arm/boot/dts/rk3188.dtsi | 44 +- + arch/arm/boot/dts/rk3288-evb-act8846.dts | 44 +- + arch/arm/boot/dts/rk3288-evb-rk808.dts | 44 +- + arch/arm/boot/dts/rk3288-evb.dtsi | 67 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 14 + + arch/arm/boot/dts/rk3288-popmetal.dts | 6 + + arch/arm/boot/dts/rk3288-thermal.dtsi | 40 +- + arch/arm/boot/dts/rk3288.dtsi | 58 +- + arch/arm/boot/dts/rk3xxx.dtsi | 44 +- + arch/arm/boot/dts/sama5d3.dtsi | 11 +- + arch/arm/boot/dts/sama5d3xcm.dtsi | 6 - + arch/arm/boot/dts/sama5d4.dtsi | 198 ++- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 1 + + arch/arm/boot/dts/sh73a0.dtsi | 10 +- + arch/arm/boot/dts/socfpga.dtsi | 19 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 335 ++++- + ...rria10_socdk.dts => socfpga_arria10_socdk.dtsi} | 12 +- + arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts | 26 + + arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 16 + + arch/arm/boot/dts/ste-dbx5x0.dtsi | 175 +++ + arch/arm/boot/dts/ste-href-stuib.dtsi | 50 + + arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 7 +- + arch/arm/boot/dts/ste-snowball.dts | 23 +- + arch/arm/boot/dts/stih407-b2120.dts | 2 +- + arch/arm/boot/dts/stih407-family.dtsi | 231 +++- + arch/arm/boot/dts/stih407-pinctrl.dtsi | 2 + + arch/arm/boot/dts/stih407.dtsi | 28 + + arch/arm/boot/dts/stih410-b2120.dts | 10 + + arch/arm/boot/dts/stih416-b2020e.dts | 10 + + arch/arm/boot/dts/stih416-pinctrl.dtsi | 50 + + arch/arm/boot/dts/stih416.dtsi | 66 +- + arch/arm/boot/dts/stih418-b2199.dts | 27 + + arch/arm/boot/dts/stihxxx-b2120.dtsi | 13 + + arch/arm/boot/dts/sun4i-a10-a1000.dts | 207 ++-- + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 181 +-- + arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 40 +- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 222 ++-- + arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 171 +++ + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 196 ++- + arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 13 +- + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 123 +- + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 189 +++ + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 16 +- + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 149 ++- + arch/arm/boot/dts/sun4i-a10-mk802.dts | 13 +- + arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 13 +- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 224 ++-- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 185 +-- + arch/arm/boot/dts/sun4i-a10.dtsi | 163 ++- + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 154 +++ + arch/arm/boot/dts/sun5i-a10s-mk802.dts | 13 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 324 +++-- + arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 139 +-- + arch/arm/boot/dts/sun5i-a10s.dtsi | 642 ++-------- + arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 143 ++- + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 155 ++- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 245 ++-- + arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 226 ++++ + arch/arm/boot/dts/sun5i-a13.dtsi | 608 ++------- + arch/arm/boot/dts/sun5i.dtsi | 613 +++++++++ + arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 63 +- + arch/arm/boot/dts/sun6i-a31-colombus.dts | 145 ++- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 108 +- + arch/arm/boot/dts/sun6i-a31-i7.dts | 149 +++ + arch/arm/boot/dts/sun6i-a31-m9.dts | 159 ++- + arch/arm/boot/dts/sun6i-a31.dtsi | 133 +- + arch/arm/boot/dts/sun6i-a31s-cs908.dts | 48 +- + arch/arm/boot/dts/sun6i-a31s.dtsi | 5 - + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 271 ++-- + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 21 +- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 205 +-- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 331 ++--- + arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 426 ++++--- + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 267 ++-- + arch/arm/boot/dts/sun7i-a20-m3.dts | 191 +-- + arch/arm/boot/dts/sun7i-a20-mk808c.dts | 148 +++ + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 197 +-- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 301 ++--- + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 411 +++--- + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 250 ++++ + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 228 ++++ + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 194 +++ + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 217 ++-- + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 183 +++ + arch/arm/boot/dts/sun7i-a20.dtsi | 186 ++- + arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts | 5 - + arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 117 +- + arch/arm/boot/dts/sun8i-a23.dtsi | 33 +- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 99 ++ + arch/arm/boot/dts/sun9i-a80-optimus.dts | 72 +- + arch/arm/boot/dts/sun9i-a80.dtsi | 139 ++- + arch/arm/boot/dts/sunxi-common-regulators.dtsi | 5 - + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 4 + + arch/arm/boot/dts/tegra124-venice2.dts | 3 + + arch/arm/boot/dts/tegra124.dtsi | 6 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 12 + + arch/arm/boot/dts/tegra20.dtsi | 2 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 30 +- + arch/arm/boot/dts/tegra30.dtsi | 15 + + arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts | 79 ++ + arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 110 ++ + arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts | 79 ++ + arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 117 ++ + arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts | 80 ++ + arch/arm/boot/dts/uniphier-ph1-sld3.dtsi | 117 ++ + arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts | 79 ++ + arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 110 ++ + arch/arm/boot/dts/uniphier-support-card.dtsi | 65 + + arch/arm/boot/dts/vf610m4-colibri.dts | 99 ++ + arch/arm/boot/dts/vf610m4.dtsi | 50 + + arch/arm/boot/dts/zynq-7000.dtsi | 4 +- + arch/arm/boot/dts/zynq-parallella.dts | 9 +- + arch/arm/boot/dts/zynq-zc702.dts | 3 +- + arch/arm/boot/dts/zynq-zc706.dts | 3 +- + arch/arm/boot/dts/zynq-zed.dts | 3 +- + arch/arm/boot/dts/zynq-zybo.dts | 8 +- + arch/arm/configs/at91_dt_defconfig | 2 + + arch/arm/configs/efm32_defconfig | 2 +- + arch/arm/configs/hisi_defconfig | 2 + + arch/arm/configs/imx_v6_v7_defconfig | 9 + + arch/arm/configs/lpc18xx_defconfig | 151 +++ + arch/arm/configs/multi_v7_defconfig | 109 +- + arch/arm/configs/qcom_defconfig | 2 + + arch/arm/configs/sama5_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 4 +- + arch/arm/configs/stm32_defconfig | 70 ++ + arch/arm/configs/tegra_defconfig | 10 + + arch/arm/configs/u8500_defconfig | 5 + + arch/arm/configs/vf610m4_defconfig | 42 + + arch/arm/configs/zx_defconfig | 129 ++ + arch/arm/include/asm/vfp.h | 9 + + arch/arm/include/debug/8250.S | 3 + + arch/arm/include/debug/efm32.S | 2 +- + arch/arm/include/debug/pl01x.S | 7 + + arch/arm/kernel/debug.S | 2 +- + arch/arm/mach-at91/Makefile | 5 - + arch/arm/mach-at91/Makefile.boot | 8 - + arch/arm/mach-at91/include/mach/at91_ramc.h | 28 - + arch/arm/mach-at91/include/mach/at91rm9200_mc.h | 116 -- + arch/arm/mach-at91/include/mach/at91sam9_smc.h | 98 -- + arch/arm/mach-at91/pm.c | 8 +- + arch/arm/mach-at91/pm.h | 14 +- + arch/arm/mach-at91/pm_suspend.S | 3 +- + arch/arm/mach-at91/sam9_smc.c | 136 -- + arch/arm/mach-at91/sam9_smc.h | 11 - + arch/arm/mach-bcm/Kconfig | 2 + + arch/arm/mach-bcm/Makefile | 7 +- + arch/arm/mach-bcm/bcm63xx_headsmp.S | 23 + + arch/arm/mach-bcm/bcm63xx_pmb.c | 221 ++++ + arch/arm/mach-bcm/bcm63xx_smp.c | 169 +++ + arch/arm/mach-bcm/bcm63xx_smp.h | 9 + + arch/arm/mach-bcm/bcm_5301x.c | 9 +- + arch/arm/mach-bcm/board_bcm2835.c | 91 -- + arch/arm/mach-berlin/Kconfig | 1 + + arch/arm/mach-imx/Kconfig | 72 +- + arch/arm/mach-imx/Makefile | 2 - + arch/arm/mach-imx/Makefile.boot | 0 + arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 318 ----- + arch/arm/mach-imx/gpc.c | 1 - + arch/arm/mach-imx/mach-cpuimx35.c | 206 ---- + arch/arm/mach-imx/mach-vf610.c | 1 + + arch/arm/mach-lpc18xx/Makefile | 1 + + arch/arm/mach-lpc18xx/Makefile.boot | 3 + + arch/arm/mach-lpc18xx/board-dt.c | 22 + + arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 +- + arch/arm/mach-omap1/board-ams-delta.c | 1 + + arch/arm/mach-omap1/board-fsample.c | 1 + + arch/arm/mach-omap1/board-generic.c | 1 + + arch/arm/mach-omap1/board-h2.c | 1 + + arch/arm/mach-omap1/board-h3-mmc.c | 1 + + arch/arm/mach-omap1/board-h3.c | 1 + + arch/arm/mach-omap1/board-htcherald.c | 1 + + arch/arm/mach-omap1/board-innovator.c | 1 + + arch/arm/mach-omap1/board-nokia770.c | 1 + + arch/arm/mach-omap1/board-osk.c | 1 + + arch/arm/mach-omap1/board-palmte.c | 1 + + arch/arm/mach-omap1/board-palmtt.c | 1 + + arch/arm/mach-omap1/board-palmz71.c | 1 + + arch/arm/mach-omap1/board-perseus2.c | 1 + + arch/arm/mach-omap1/board-sx1.c | 1 + + arch/arm/mach-omap1/board-voiceblue.c | 1 + + arch/arm/mach-omap1/common.h | 7 +- + arch/arm/mach-omap1/dma.c | 2 +- + arch/arm/mach-omap1/gpio16xx.c | 2 + + arch/arm/mach-omap1/gpio7xx.c | 2 + + arch/arm/mach-omap1/i2c.c | 3 +- + arch/arm/mach-omap1/include/mach/entry-macro.S | 39 - + arch/arm/mach-omap1/include/mach/irqs.h | 124 +- + arch/arm/mach-omap1/include/mach/memory.h | 4 +- + arch/arm/mach-omap1/include/mach/serial.h | 5 - + arch/arm/mach-omap1/include/mach/soc.h | 4 + + arch/arm/mach-omap1/irq.c | 157 ++- + arch/arm/mach-omap1/mux.c | 8 +- + arch/arm/mach-omap1/pm.c | 1 + + arch/arm/mach-omap1/serial.c | 1 + + arch/arm/mach-omap1/timer.c | 4 +- + arch/arm/mach-omap2/Kconfig | 22 - + arch/arm/mach-omap2/Makefile | 3 - + arch/arm/mach-omap2/board-cm-t35.c | 769 ------------ + arch/arm/mach-omap2/board-omap3beagle.c | 595 --------- + arch/arm/mach-omap2/board-overo.c | 571 --------- + arch/arm/mach-omap2/control.c | 3 + + arch/arm/mach-omap2/control.h | 3 + + arch/arm/mach-omap2/devices.c | 4 +- + arch/arm/mach-omap2/fb.c | 2 +- + arch/arm/mach-omap2/omap-wakeupgen.c | 2 +- + arch/arm/mach-omap2/pdata-quirks.c | 22 + + arch/arm/mach-omap2/pmu.c | 2 +- + arch/arm/mach-omap2/serial.c | 2 +- + arch/arm/mach-pxa/Makefile | 9 +- + arch/arm/mach-pxa/clock-pxa2xx.c | 55 - + arch/arm/mach-pxa/clock-pxa3xx.c | 212 ---- + arch/arm/mach-pxa/clock.c | 86 -- + arch/arm/mach-pxa/clock.h | 80 -- + arch/arm/mach-pxa/eseries.c | 27 +- + arch/arm/mach-pxa/generic.c | 6 + + arch/arm/mach-pxa/generic.h | 3 + + arch/arm/mach-pxa/irq.c | 2 +- + arch/arm/mach-pxa/lubbock.c | 4 +- + arch/arm/mach-pxa/pxa25x.c | 183 --- + arch/arm/mach-pxa/pxa27x.c | 182 +-- + arch/arm/mach-pxa/pxa300.c | 20 +- + arch/arm/mach-pxa/pxa320.c | 10 - + arch/arm/mach-pxa/pxa3xx.c | 59 - + arch/arm/mach-pxa/raumfeld.c | 1 - + arch/arm/mach-pxa/tosa.c | 1 - + arch/arm/mach-shmobile/Kconfig | 4 +- + arch/arm/mach-socfpga/Kconfig | 1 + + arch/arm/mach-socfpga/core.h | 2 - + arch/arm/mach-socfpga/headsmp.S | 5 +- + arch/arm/mach-socfpga/platsmp.c | 33 +- + arch/arm/mach-socfpga/socfpga.c | 34 - + arch/arm/mach-sti/Kconfig | 1 + + arch/arm/mach-stm32/Makefile | 1 + + arch/arm/mach-stm32/Makefile.boot | 3 + + arch/arm/mach-stm32/board-dt.c | 19 + + arch/arm/mach-sunxi/platsmp.c | 69 ++ + arch/arm/mach-tegra/cpuidle-tegra20.c | 5 +- + arch/arm/mach-tegra/reset-handler.S | 10 +- + arch/arm/mach-tegra/reset.h | 4 + + arch/arm/mach-tegra/sleep-tegra20.S | 37 +- + arch/arm/mach-tegra/sleep-tegra30.S | 2 +- + arch/arm/mach-tegra/sleep.h | 4 + + arch/arm/mach-tegra/tegra.c | 1 - + arch/arm/mach-uniphier/Kconfig | 11 + + arch/arm/mach-uniphier/Makefile | 2 + + arch/arm/mach-uniphier/platsmp.c | 90 ++ + arch/arm/mach-uniphier/uniphier.c | 30 + + arch/arm/mach-ux500/cache-l2x0.c | 11 +- + arch/arm/mach-ux500/cpu-db8500.c | 60 +- + arch/arm/mach-ux500/cpu.c | 20 +- + arch/arm/mach-ux500/id.c | 2 +- + arch/arm/mach-ux500/platsmp.c | 35 +- + arch/arm/mach-ux500/pm.c | 15 +- + arch/arm/mach-ux500/setup.h | 16 +- + arch/arm/mach-zx/Kconfig | 18 + + arch/arm/mach-zx/Makefile | 2 + + arch/arm/mach-zx/core.h | 19 + + arch/arm/mach-zx/headsmp.S | 33 + + arch/arm/mach-zx/platsmp.c | 189 +++ + arch/arm/mach-zx/zx296702.c | 25 + + arch/arm/mach-zynq/common.c | 6 - + arch/arm/mach-zynq/common.h | 1 - + arch/arm/mach-zynq/slcr.c | 28 +- + arch/arm/plat-omap/dma.c | 4 + + arch/arm/vfp/vfpmodule.c | 13 + + arch/arm64/boot/dts/arm/Makefile | 2 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 154 +++ + arch/arm64/boot/dts/arm/juno-clocks.dtsi | 4 +- + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 68 + + arch/arm64/boot/dts/arm/juno-r1.dts | 116 ++ + arch/arm64/boot/dts/arm/juno.dts | 129 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 41 +- + .../arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 30 + + arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi | 21 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 3 + + arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 25 +- + arch/arm64/boot/dts/qcom/pm8916.dtsi | 99 ++ + arch/arm64/boot/dts/skeleton.dtsi | 13 - + arch/arm64/configs/defconfig | 6 + + drivers/ata/Kconfig | 1 - + drivers/ata/pata_at91.c | 92 +- + drivers/bus/Kconfig | 31 +- + drivers/bus/arm-cci.c | 905 +++++++++++--- + drivers/bus/arm-ccn.c | 270 +++- + drivers/bus/brcmstb_gisb.c | 13 +- + drivers/bus/mvebu-mbus.c | 117 ++ + drivers/clk/berlin/bg2.c | 7 +- + drivers/clk/berlin/bg2q.c | 7 +- + drivers/clk/pxa/clk-pxa27x.c | 32 +- + drivers/firmware/Makefile | 3 +- + drivers/firmware/qcom_scm-32.c | 503 ++++++++ + drivers/firmware/qcom_scm.c | 474 +------ + drivers/firmware/qcom_scm.h | 47 + + drivers/iommu/Kconfig | 2 +- + drivers/iommu/tegra-smmu.c | 109 ++ + drivers/irqchip/Kconfig | 1 + + drivers/irqchip/irq-nvic.c | 28 +- + drivers/irqchip/irq-vf610-mscm-ir.c | 23 +- + drivers/leds/leds-syscon.c | 170 +-- + drivers/memory/tegra/Kconfig | 10 + + drivers/memory/tegra/Makefile | 3 + + drivers/memory/tegra/mc.c | 143 ++- + drivers/memory/tegra/mc.h | 4 + + drivers/memory/tegra/tegra114.c | 32 +- + drivers/memory/tegra/tegra124-emc.c | 1140 +++++++++++++++++ + drivers/memory/tegra/tegra124.c | 123 +- + drivers/memory/tegra/tegra30.c | 32 +- + drivers/of/platform.c | 1 + + drivers/pcmcia/Kconfig | 1 - + drivers/pcmcia/at91_cf.c | 25 +- + drivers/pinctrl/berlin/berlin-bg2.c | 26 +- + drivers/pinctrl/berlin/berlin-bg2cd.c | 26 +- + drivers/pinctrl/berlin/berlin-bg2q.c | 26 +- + drivers/pinctrl/berlin/berlin.c | 9 +- + drivers/reset/reset-berlin.c | 74 +- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/qcom/Kconfig | 9 + + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/spm.c | 385 ++++++ + drivers/soc/sunxi/Kconfig | 10 + + drivers/soc/sunxi/Makefile | 1 + + drivers/soc/sunxi/sunxi_sram.c | 284 +++++ + drivers/soc/tegra/fuse/fuse-tegra20.c | 6 +- + drivers/soc/tegra/fuse/tegra-apbmisc.c | 21 + + drivers/soc/tegra/pmc.c | 23 +- + drivers/watchdog/bcm2835_wdt.c | 62 + + include/dt-bindings/clock/r8a73a4-clock.h | 1 + + include/dt-bindings/clock/r8a7790-clock.h | 3 + + include/dt-bindings/clock/r8a7791-clock.h | 3 + + include/dt-bindings/clock/r8a7794-clock.h | 3 + + include/dt-bindings/mfd/st-lpc.h | 15 + + include/dt-bindings/pinctrl/am43xx.h | 1 + + include/dt-bindings/pinctrl/bcm2835.h | 27 + + include/linux/irq.h | 2 + + include/linux/irqdomain.h | 8 +- + include/linux/mbus.h | 5 + + include/linux/mfd/syscon/atmel-mc.h | 144 +++ + include/linux/qcom_scm.h | 13 +- + include/linux/reset/bcm63xx_pmb.h | 88 ++ + include/linux/soc/sunxi/sunxi_sram.h | 19 + + include/soc/at91/at91rm9200_sdramc.h | 63 - + include/soc/tegra/emc.h | 19 + + include/soc/tegra/fuse.h | 1 + + include/soc/tegra/mc.h | 20 +- + include/soc/tegra/pmc.h | 2 - + include/uapi/linux/serial_reg.h | 3 + + kernel/irq/chip.c | 28 + + kernel/irq/generic-chip.c | 5 +- + kernel/irq/irqdomain.c | 21 + + 513 files changed, 24821 insertions(+), 10483 deletions(-) + create mode 100644 Documentation/arm/stm32/overview.txt + create mode 100644 Documentation/arm/stm32/stm32f429-overview.txt + create mode 100644 Documentation/devicetree/bindings/arm/scu.txt + create mode 100644 Documentation/devicetree/bindings/arm/ux500/boards.txt + create mode 100644 Documentation/devicetree/bindings/clock/marvell,berlin.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/tegra-emc.txt + create mode 100644 Documentation/devicetree/bindings/mfd/mfd.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/berlin,pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/reset/berlin,reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/brcm,bcm63138-pmb.txt + create mode 100644 Documentation/devicetree/bindings/soc/sunxi/sram.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-baltos-ir5221.dts + create mode 100644 arch/arm/boot/dts/armada-370-dlink-dns327l.dts + create mode 100644 arch/arm/boot/dts/armada-385-linksys-caiman.dts + create mode 100644 arch/arm/boot/dts/armada-385-linksys-cobra.dts + create mode 100644 arch/arm/boot/dts/armada-385-linksys.dtsi + create mode 100644 arch/arm/boot/dts/at91-kizbox.dts + create mode 100644 arch/arm/boot/dts/at91-kizbox2.dts + create mode 100644 arch/arm/boot/dts/at91-kizboxmini.dts + create mode 100644 arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts + create mode 100644 arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts + create mode 100644 arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts + create mode 100644 arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts + delete mode 100644 arch/arm/boot/dts/dove-cm-a510.dts + create mode 100644 arch/arm/boot/dts/dove-cm-a510.dtsi + create mode 100644 arch/arm/boot/dts/dove-sbc-a510.dts + delete mode 100644 arch/arm/boot/dts/kizbox.dts + create mode 100644 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts + create mode 100644 arch/arm/boot/dts/logicpd-torpedo-som.dtsi + create mode 100644 arch/arm/boot/dts/lpc18xx.dtsi + create mode 100644 arch/arm/boot/dts/lpc4350-hitex-eval.dts + create mode 100644 arch/arm/boot/dts/lpc4350.dtsi + create mode 100644 arch/arm/boot/dts/lpc4357-ea4357-devkit.dts + create mode 100644 arch/arm/boot/dts/lpc4357.dtsi + create mode 100644 arch/arm/boot/dts/mt8135-pinfunc.h + rename arch/arm/boot/dts/{socfpga_arria10_socdk.dts => socfpga_arria10_socdk.dtsi} (90%) + mode change 100755 => 100644 + create mode 100644 arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts + create mode 100644 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts + create mode 100644 arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts + create mode 100644 arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts + create mode 100644 arch/arm/boot/dts/sun5i-a13-utoo-p66.dts + create mode 100644 arch/arm/boot/dts/sun5i.dtsi + create mode 100644 arch/arm/boot/dts/sun6i-a31-i7.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-mk808c.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-orangepi.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts + create mode 100644 arch/arm/boot/dts/sun9i-a80-cubieboard4.dts + create mode 100644 arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts + create mode 100644 arch/arm/boot/dts/uniphier-ph1-ld4.dtsi + create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts + create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro4.dtsi + create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts + create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld3.dtsi + create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts + create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld8.dtsi + create mode 100644 arch/arm/boot/dts/uniphier-support-card.dtsi + create mode 100644 arch/arm/boot/dts/vf610m4-colibri.dts + create mode 100644 arch/arm/boot/dts/vf610m4.dtsi + create mode 100644 arch/arm/configs/lpc18xx_defconfig + create mode 100644 arch/arm/configs/stm32_defconfig + create mode 100644 arch/arm/configs/vf610m4_defconfig + create mode 100644 arch/arm/configs/zx_defconfig + delete mode 100644 arch/arm/mach-at91/Makefile.boot + delete mode 100644 arch/arm/mach-at91/include/mach/at91_ramc.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91rm9200_mc.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9_smc.h + delete mode 100644 arch/arm/mach-at91/sam9_smc.c + delete mode 100644 arch/arm/mach-at91/sam9_smc.h + create mode 100644 arch/arm/mach-bcm/bcm63xx_headsmp.S + create mode 100644 arch/arm/mach-bcm/bcm63xx_pmb.c + create mode 100644 arch/arm/mach-bcm/bcm63xx_smp.c + create mode 100644 arch/arm/mach-bcm/bcm63xx_smp.h + create mode 100644 arch/arm/mach-imx/Makefile.boot + delete mode 100644 arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c + delete mode 100644 arch/arm/mach-imx/mach-cpuimx35.c + create mode 100644 arch/arm/mach-lpc18xx/Makefile + create mode 100644 arch/arm/mach-lpc18xx/Makefile.boot + create mode 100644 arch/arm/mach-lpc18xx/board-dt.c + delete mode 100644 arch/arm/mach-omap1/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-omap2/board-cm-t35.c + delete mode 100644 arch/arm/mach-omap2/board-omap3beagle.c + delete mode 100644 arch/arm/mach-omap2/board-overo.c + delete mode 100644 arch/arm/mach-pxa/clock-pxa2xx.c + delete mode 100644 arch/arm/mach-pxa/clock-pxa3xx.c + delete mode 100644 arch/arm/mach-pxa/clock.c + delete mode 100644 arch/arm/mach-pxa/clock.h + create mode 100644 arch/arm/mach-stm32/Makefile + create mode 100644 arch/arm/mach-stm32/Makefile.boot + create mode 100644 arch/arm/mach-stm32/board-dt.c + create mode 100644 arch/arm/mach-uniphier/Kconfig + create mode 100644 arch/arm/mach-uniphier/Makefile + create mode 100644 arch/arm/mach-uniphier/platsmp.c + create mode 100644 arch/arm/mach-uniphier/uniphier.c + create mode 100644 arch/arm/mach-zx/Kconfig + create mode 100644 arch/arm/mach-zx/Makefile + create mode 100644 arch/arm/mach-zx/core.h + create mode 100644 arch/arm/mach-zx/headsmp.S + create mode 100644 arch/arm/mach-zx/platsmp.c + create mode 100644 arch/arm/mach-zx/zx296702.c + create mode 100644 arch/arm64/boot/dts/arm/juno-base.dtsi + create mode 100644 arch/arm64/boot/dts/arm/juno-r1.dts + create mode 100644 arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8916.dtsi + delete mode 100644 arch/arm64/boot/dts/skeleton.dtsi + create mode 100644 drivers/firmware/qcom_scm-32.c + create mode 100644 drivers/firmware/qcom_scm.h + create mode 100644 drivers/memory/tegra/tegra124-emc.c + create mode 100644 drivers/soc/qcom/spm.c + create mode 100644 drivers/soc/sunxi/Kconfig + create mode 100644 drivers/soc/sunxi/Makefile + create mode 100644 drivers/soc/sunxi/sunxi_sram.c + create mode 100644 include/dt-bindings/mfd/st-lpc.h + create mode 100644 include/dt-bindings/pinctrl/bcm2835.h + create mode 100644 include/linux/mfd/syscon/atmel-mc.h + create mode 100644 include/linux/reset/bcm63xx_pmb.h + create mode 100644 include/linux/soc/sunxi/sunxi_sram.h + delete mode 100644 include/soc/at91/at91rm9200_sdramc.h + create mode 100644 include/soc/tegra/emc.h +Merging at91/at91-next (dd1f58f398fb Merge branch 'at91-4.2-dt' into at91-next) +$ git merge at91/at91-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/at91-ariettag25.dts | 79 +++++++++++++++++++++++++++++ + arch/arm/boot/dts/at91-kizbox.dts | 4 +- + arch/arm/boot/dts/at91-kizbox2.dts | 2 +- + arch/arm/boot/dts/at91-kizboxmini.dts | 2 +- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 2 +- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 3 +- + arch/arm/boot/dts/at91-sama5d4ek.dts | 7 +-- + arch/arm/boot/dts/at91rm9200ek.dts | 4 ++ + arch/arm/boot/dts/at91sam9261ek.dts | 3 +- + arch/arm/boot/dts/at91sam9263ek.dts | 3 +- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 3 +- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 3 +- + arch/arm/boot/dts/at91sam9n12ek.dts | 3 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 15 +++--- + arch/arm/boot/dts/at91sam9rlek.dts | 7 ++- + arch/arm/boot/dts/at91sam9x5ek.dtsi | 3 +- + arch/arm/boot/dts/sama5d3xcm.dtsi | 3 +- + 18 files changed, 123 insertions(+), 24 deletions(-) + create mode 100644 arch/arm/boot/dts/at91-ariettag25.dts +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging rpi/for-rpi-next (50b674b89355 Merge branches 'for-rpi-next-soc' and 'for-rpi-next-dt' into for-rpi-next) +$ git merge rpi/for-rpi-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging berlin/berlin/for-next (7f8ad9c26be9 Merge branch 'berlin/simple-mfd' 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 (e799b6f37e6c ARM: zImage: add support for ARMv7-M) +$ git merge cortex-m/for-next +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (5bfaa924477b Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Resolved 'arch/arm/mach-imx/Kconfig' using previous resolution. +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/clk/imx/clk.h +Auto-merging drivers/clk/imx/clk-vf610.c +Auto-merging drivers/clk/imx/clk-pllv3.c +Auto-merging drivers/clk/imx/clk-pllv1.c +Auto-merging drivers/clk/imx/clk-imx6sx.c +Auto-merging drivers/clk/imx/clk-imx6sl.c +Auto-merging drivers/clk/imx/clk-imx6q.c +Auto-merging drivers/clk/imx/clk-imx51-imx53.c +Auto-merging drivers/clk/imx/clk-imx35.c +Auto-merging drivers/clk/imx/clk-imx31.c +Auto-merging drivers/clk/imx/clk-imx27.c +Auto-merging drivers/clk/imx/clk-imx25.c +Auto-merging drivers/clk/imx/clk-imx21.c +Auto-merging drivers/clk/imx/clk-imx1.c +Auto-merging drivers/clk/imx/clk-cpu.c +Removing arch/arm/mach-imx/time.c +Auto-merging arch/arm/mach-imx/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-imx/Kconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig.debug +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c0250a32a488] Merge remote-tracking branch 'imx-mxs/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/clock/imx7d-clock.txt | 13 + + .../bindings/pinctrl/fsl,imx7d-pinctrl.txt | 27 + + MAINTAINERS | 2 + + arch/arm/Kconfig.debug | 13 +- + arch/arm/boot/dts/Makefile | 8 + + arch/arm/boot/dts/imx23-olinuxino.dts | 6 + + arch/arm/boot/dts/imx23.dtsi | 40 +- + arch/arm/boot/dts/imx28-cfa10036.dts | 3 + + arch/arm/boot/dts/imx6dl-apf6dev.dts | 60 ++ + arch/arm/boot/dts/imx6dl-aristainetos2_4.dts | 159 +++ + arch/arm/boot/dts/imx6dl-aristainetos2_7.dts | 97 ++ + arch/arm/boot/dts/imx6dl-cubox-i.dts | 5 +- + arch/arm/boot/dts/imx6dl-gw551x.dts | 55 ++ + arch/arm/boot/dts/imx6dl-hummingboard.dts | 5 +- + arch/arm/boot/dts/imx6dl.dtsi | 4 + + arch/arm/boot/dts/imx6q-apf6dev.dts | 64 ++ + arch/arm/boot/dts/imx6q-cubox-i.dts | 5 +- + arch/arm/boot/dts/imx6q-gw551x.dts | 55 ++ + arch/arm/boot/dts/imx6q-hummingboard.dts | 5 +- + arch/arm/boot/dts/imx6qdl-apf6.dtsi | 158 +++ + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 479 +++++++++ + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 633 ++++++++++++ + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 314 ++++++ + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 19 +- + arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi | 5 +- + arch/arm/boot/dts/imx6qdl-microsom.dtsi | 108 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 30 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 30 +- + arch/arm/boot/dts/imx6qdl.dtsi | 57 +- + arch/arm/boot/dts/imx6sl-warp.dts | 39 +- + arch/arm/boot/dts/imx7d-pinfunc.h | 1038 ++++++++++++++++++++ + arch/arm/boot/dts/imx7d-sdb.dts | 408 ++++++++ + arch/arm/boot/dts/imx7d.dtsi | 486 +++++++++ + arch/arm/boot/dts/vf-colibri.dtsi | 2 +- + arch/arm/boot/dts/vf610-cosmic.dts | 2 +- + arch/arm/boot/dts/vf610-pinfunc.h | 2 +- + arch/arm/boot/dts/vf610-twr.dts | 2 +- + arch/arm/include/debug/imx-uart.h | 15 +- + arch/arm/mach-imx/Kconfig | 11 +- + arch/arm/mach-imx/Makefile | 31 +- + arch/arm/mach-imx/anatop.c | 5 +- + arch/arm/mach-imx/common.h | 15 +- + arch/arm/mach-imx/cpu.c | 3 + + arch/arm/mach-imx/cpuidle-imx6q.c | 4 +- + arch/arm/mach-imx/cpuidle-imx6sl.c | 4 +- + arch/arm/mach-imx/cpuidle-imx6sx.c | 4 +- + arch/arm/mach-imx/gpc.c | 2 +- + arch/arm/mach-imx/hardware.h | 1 + + arch/arm/mach-imx/iomux-imx31.c | 2 +- + arch/arm/mach-imx/mach-imx6q.c | 1 + + arch/arm/mach-imx/mach-imx6sl.c | 1 + + arch/arm/mach-imx/mach-imx6sx.c | 1 + + arch/arm/mach-imx/mach-imx7d.c | 43 + + arch/arm/mach-imx/mmdc.c | 2 + + arch/arm/mach-imx/mx27.h | 4 - + arch/arm/mach-imx/mx3x.h | 7 - + arch/arm/mach-imx/mxc.h | 24 +- + arch/arm/mach-imx/pm-imx5.c | 205 +++- + arch/arm/mach-imx/pm-imx6.c | 38 +- + arch/arm/mach-imx/suspend-imx53.S | 139 +++ + arch/arm/mach-imx/time.c | 385 -------- + drivers/clk/Makefile | 1 + + drivers/clk/imx/Makefile | 26 + + {arch/arm/mach-imx => drivers/clk/imx}/clk-busy.c | 0 + {arch/arm/mach-imx => drivers/clk/imx}/clk-cpu.c | 1 + + .../mach-imx => drivers/clk/imx}/clk-fixup-div.c | 0 + .../mach-imx => drivers/clk/imx}/clk-fixup-mux.c | 0 + .../clk/imx}/clk-gate-exclusive.c | 0 + {arch/arm/mach-imx => drivers/clk/imx}/clk-gate2.c | 0 + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx1.c | 17 +- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c | 14 +- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx25.c | 6 +- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx27.c | 15 +- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx31.c | 35 +- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx35.c | 36 +- + .../mach-imx => drivers/clk/imx}/clk-imx51-imx53.c | 5 +- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6q.c | 36 +- + .../arm/mach-imx => drivers/clk/imx}/clk-imx6sl.c | 7 - + .../arm/mach-imx => drivers/clk/imx}/clk-imx6sx.c | 6 - + drivers/clk/imx/clk-imx7d.c | 860 ++++++++++++++++ + {arch/arm/mach-imx => drivers/clk/imx}/clk-pfd.c | 0 + {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv1.c | 33 +- + {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv2.c | 0 + {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv3.c | 13 +- + {arch/arm/mach-imx => drivers/clk/imx}/clk-vf610.c | 4 + + {arch/arm/mach-imx => drivers/clk/imx}/clk.c | 0 + {arch/arm/mach-imx => drivers/clk/imx}/clk.h | 14 +- + drivers/clocksource/Kconfig | 6 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/timer-imx-gpt.c | 540 ++++++++++ + include/dt-bindings/clock/imx7d-clock.h | 450 +++++++++ + include/dt-bindings/clock/vf610-clock.h | 3 +- + include/soc/imx/revision.h | 37 + + include/soc/imx/timer.h | 26 + + 95 files changed, 6900 insertions(+), 682 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/imx7d-clock.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt + create mode 100644 arch/arm/boot/dts/imx6dl-apf6dev.dts + create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos2_4.dts + create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos2_7.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw551x.dts + create mode 100644 arch/arm/boot/dts/imx6q-apf6dev.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw551x.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-apf6.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-apf6dev.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-gw551x.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx7d-sdb.dts + create mode 100644 arch/arm/boot/dts/imx7d.dtsi + create mode 100644 arch/arm/mach-imx/mach-imx7d.c + create mode 100644 arch/arm/mach-imx/suspend-imx53.S + delete mode 100644 arch/arm/mach-imx/time.c + create mode 100644 drivers/clk/imx/Makefile + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-busy.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-cpu.c (99%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-fixup-div.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-fixup-mux.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate-exclusive.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate2.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx1.c (91%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c (95%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx25.c (98%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx27.c (97%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx31.c (91%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx35.c (94%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx51-imx53.c (99%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6q.c (98%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6sl.c (99%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6sx.c (99%) + create mode 100644 drivers/clk/imx/clk-imx7d.c + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pfd.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv1.c (75%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv2.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv3.c (96%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-vf610.c (98%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk.c (100%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk.h (94%) + create mode 100644 drivers/clocksource/timer-imx-gpt.c + create mode 100644 include/dt-bindings/clock/imx7d-clock.h + create mode 100644 include/soc/imx/revision.h + create mode 100644 include/soc/imx/timer.h +Merging keystone/next (a6ba4234e474 ARM: dts: k2l: fix the netcp range size) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/k2e-evm.dts | 1 + + arch/arm/boot/dts/k2e-netcp.dtsi | 206 +++++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/k2e.dtsi | 1 + + arch/arm/boot/dts/k2hk-evm.dts | 1 + + arch/arm/boot/dts/k2hk-netcp.dtsi | 208 ++++++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/k2hk.dtsi | 1 + + arch/arm/boot/dts/k2l-evm.dts | 1 + + arch/arm/boot/dts/k2l-netcp.dtsi | 189 ++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/k2l.dtsi | 1 + + arch/arm/configs/keystone_defconfig | 6 ++ + 10 files changed, 615 insertions(+) + create mode 100644 arch/arm/boot/dts/k2e-netcp.dtsi + create mode 100644 arch/arm/boot/dts/k2hk-netcp.dtsi + create mode 100644 arch/arm/boot/dts/k2l-netcp.dtsi +Merging mvebu/for-next (96a9fef8a7fa Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (b6d4b793e013 Merge branch 'omap-for-v4.2/fixes' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/mach-omap2/omap_device.c +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am335x-sl50.dts | 482 +++++++++++++++++++++ + arch/arm/boot/dts/omap3-devkit8000.dts | 41 ++ + arch/arm/configs/omap2plus_defconfig | 3 + + arch/arm/mach-omap2/dma.c | 1 - + arch/arm/mach-omap2/omap_device.c | 30 +- + arch/arm/mach-omap2/omap_hwmod.c | 10 +- + arch/arm/mach-omap2/omap_hwmod.h | 6 + + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 12 +- + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 1 + + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 16 +- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 13 - + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 119 ++++- + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 22 + + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 11 +- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 4 +- + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 + + arch/arm/mach-omap2/prcm43xx.h | 2 + + drivers/memory/Kconfig | 8 + + drivers/memory/omap-gpmc.c | 14 +- + 21 files changed, 713 insertions(+), 86 deletions(-) + create mode 100644 arch/arm/boot/dts/am335x-sl50.dts +Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) +$ git merge omap-pending/for-next +Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution. +Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution. +Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 09b3a8e85ef1] Merge remote-tracking branch 'omap-pending/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging renesas/next (613915220fbc Merge branch 'heads/dt-for-v4.2' into next) +$ git merge renesas/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging samsung/for-next (7585f44e561e Merge branch 'v4.2-next/dt64-samsung' into for-next) +$ git merge samsung/for-next +Auto-merging arch/arm/mach-exynos/suspend.c +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../bindings/arm/exynos/power_domain.txt | 7 +- + .../devicetree/bindings/arm/samsung/pmu.txt | 1 + + Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 3 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/exynos3250-monk.dts | 3 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 7 +- + arch/arm/boot/dts/exynos3250.dtsi | 48 +- + arch/arm/boot/dts/exynos4.dtsi | 150 ++- + arch/arm/boot/dts/exynos4210-origen.dts | 418 +++--- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 280 ++-- + arch/arm/boot/dts/exynos4210-trats.dts | 592 ++++----- + arch/arm/boot/dts/exynos4210.dtsi | 72 +- + arch/arm/boot/dts/exynos4212.dtsi | 12 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 732 +++++------ + arch/arm/boot/dts/exynos4412-odroidx.dts | 16 +- + arch/arm/boot/dts/exynos4412-origen.dts | 892 ++++++------- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 210 +-- + arch/arm/boot/dts/exynos4412-tiny4412.dts | 54 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 1339 ++++++++++---------- + arch/arm/boot/dts/exynos4412.dtsi | 20 +- + arch/arm/boot/dts/exynos4415.dtsi | 15 +- + arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 8 +- + arch/arm/boot/dts/exynos4x12.dtsi | 290 +++-- + arch/arm/boot/dts/exynos5.dtsi | 6 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 12 + + arch/arm/boot/dts/exynos5250-snow.dts | 46 +- + arch/arm/boot/dts/exynos5250.dtsi | 332 ++++- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 652 +++++----- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 2 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 645 +++++----- + arch/arm/boot/dts/exynos5420.dtsi | 305 ++++- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 479 +++++++ + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 20 + + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 339 +---- + arch/arm/boot/dts/exynos5440-sd5v1.dts | 10 +- + arch/arm/boot/dts/exynos5440-ssdk5440.dts | 85 +- + arch/arm/boot/dts/exynos5440.dtsi | 4 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 +- + arch/arm/boot/dts/s3c2416-smdk2416.dts | 86 +- + arch/arm/boot/dts/s3c2416.dtsi | 18 +- + arch/arm/configs/exynos_defconfig | 50 +- + arch/arm/configs/multi_v7_defconfig | 2 + + arch/arm/include/asm/firmware.h | 4 + + arch/arm/mach-exynos/common.h | 4 +- + arch/arm/mach-exynos/exynos.c | 3 +- + arch/arm/mach-exynos/firmware.c | 18 + + arch/arm/mach-exynos/platsmp.c | 86 +- + arch/arm/mach-exynos/pm.c | 51 +- + arch/arm/mach-exynos/pm_domains.c | 53 +- + arch/arm/mach-exynos/pmu.c | 6 +- + arch/arm/mach-exynos/suspend.c | 2 +- + arch/arm/plat-samsung/adc.c | 6 +- + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 698 ++++++++++ + .../dts/exynos/exynos5433-tmu-sensor-conf.dtsi | 22 + + arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi | 231 ++++ + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 931 ++++++++++++++ + include/dt-bindings/clock/samsung,s2mps11.h | 23 + + 58 files changed, 6674 insertions(+), 3730 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi + create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-pinctrl.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 + create mode 100644 include/dt-bindings/clock/samsung,s2mps11.h +Merging sunxi/sunxi/for-next (11f9fb71e172 Merge branch 'sunxi/dt-for-4.2' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/arm/sunxi/README | 18 +- + Documentation/devicetree/bindings/arm/sunxi.txt | 2 + + Documentation/devicetree/bindings/clock/sunxi.txt | 1 + + arch/arm/boot/dts/Makefile | 7 +- + arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 + + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 4 + + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 4 + + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 4 + + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 4 + + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 4 + + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 4 + + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 4 + + arch/arm/boot/dts/sun4i-a10.dtsi | 61 ++- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 4 + + arch/arm/boot/dts/sun5i-a10s.dtsi | 9 + + arch/arm/boot/dts/sun5i.dtsi | 54 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 2 +- + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 149 +++++ + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 6 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 68 ++- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 636 ++++++++++++++++++++++ + arch/arm/boot/dts/sun8i-a23-evb.dts | 134 +++++ + arch/arm/boot/dts/sun8i-a23.dtsi | 576 +------------------- + arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts | 88 +++ + arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts | 125 +++++ + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 129 +++++ + arch/arm/boot/dts/sun8i-a33.dtsi | 97 ++++ + arch/arm/boot/dts/sun9i-a80.dtsi | 6 + + arch/arm/configs/multi_v7_defconfig | 1 - + arch/arm/configs/sunxi_defconfig | 6 +- + arch/arm/mach-sunxi/Kconfig | 2 +- + arch/arm/mach-sunxi/sunxi.c | 5 +- + drivers/clk/sunxi/clk-sun9i-core.c | 10 +- + drivers/clk/sunxi/clk-sunxi.c | 3 + + drivers/clk/sunxi/clk-usb.c | 11 + + 35 files changed, 1571 insertions(+), 671 deletions(-) + create mode 100644 arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts + create mode 100644 arch/arm/boot/dts/sun8i-a23-a33.dtsi + create mode 100644 arch/arm/boot/dts/sun8i-a23-evb.dts + create mode 100644 arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts + create mode 100644 arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts + create mode 100644 arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts + create mode 100644 arch/arm/boot/dts/sun8i-a33.dtsi +Merging tegra/for-next (a9460d4a7ed1 Merge branch for-4.2/cpufreq into for-next) +$ git merge tegra/for-next +Auto-merging drivers/clk/clk.c +Merge made by the 'recursive' strategy. + .../bindings/clock/nvidia,tegra124-car.txt | 44 +- + .../bindings/clock/nvidia,tegra124-dfll.txt | 79 + + .../bindings/cpufreq/tegra124-cpufreq.txt | 44 + + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 15 +- + arch/arm/boot/dts/tegra124.dtsi | 34 + + arch/arm/configs/tegra_defconfig | 1 + + arch/arm/mach-tegra/Kconfig | 1 + + arch/arm/mach-tegra/iomap.h | 3 - + drivers/clk/Kconfig | 1 + + drivers/clk/clk.c | 8 + + drivers/clk/tegra/Kconfig | 3 + + drivers/clk/tegra/Makefile | 4 + + drivers/clk/tegra/clk-dfll.c | 1755 ++++++++++++++++++++ + drivers/clk/tegra/clk-dfll.h | 54 + + drivers/clk/tegra/clk-emc.c | 538 ++++++ + drivers/clk/tegra/clk-tegra-super-gen4.c | 4 +- + drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 166 ++ + drivers/clk/tegra/clk-tegra124.c | 101 +- + drivers/clk/tegra/clk-tegra30.c | 2 +- + drivers/clk/tegra/clk.c | 39 +- + drivers/clk/tegra/clk.h | 15 + + drivers/clk/tegra/cvb.c | 140 ++ + drivers/clk/tegra/cvb.h | 67 + + drivers/cpufreq/Kconfig.arm | 13 +- + drivers/cpufreq/Makefile | 3 +- + drivers/cpufreq/tegra124-cpufreq.c | 214 +++ + .../cpufreq/{tegra-cpufreq.c => tegra20-cpufreq.c} | 0 + drivers/memory/tegra/tegra124-emc.c | 42 +- + drivers/soc/tegra/common.c | 2 + + drivers/soc/tegra/fuse/Makefile | 2 + + drivers/soc/tegra/fuse/fuse-tegra.c | 257 ++- + drivers/soc/tegra/fuse/fuse-tegra20.c | 175 +- + drivers/soc/tegra/fuse/fuse-tegra30.c | 232 +-- + drivers/soc/tegra/fuse/fuse.h | 95 +- + drivers/soc/tegra/fuse/speedo-tegra114.c | 22 +- + drivers/soc/tegra/fuse/speedo-tegra124.c | 26 +- + drivers/soc/tegra/fuse/speedo-tegra20.c | 28 +- + drivers/soc/tegra/fuse/speedo-tegra210.c | 184 ++ + drivers/soc/tegra/fuse/speedo-tegra30.c | 48 +- + drivers/soc/tegra/fuse/tegra-apbmisc.c | 76 +- + drivers/soc/tegra/pmc.c | 104 +- + include/dt-bindings/reset/tegra124-car.h | 12 + + include/linux/clk-provider.h | 1 + + include/soc/tegra/fuse.h | 6 +- + include/soc/tegra/pmc.h | 5 + + 45 files changed, 4195 insertions(+), 470 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.txt + create mode 100644 Documentation/devicetree/bindings/cpufreq/tegra124-cpufreq.txt + create mode 100644 drivers/clk/tegra/Kconfig + create mode 100644 drivers/clk/tegra/clk-dfll.c + create mode 100644 drivers/clk/tegra/clk-dfll.h + create mode 100644 drivers/clk/tegra/clk-emc.c + create mode 100644 drivers/clk/tegra/clk-tegra124-dfll-fcpu.c + create mode 100644 drivers/clk/tegra/cvb.c + create mode 100644 drivers/clk/tegra/cvb.h + create mode 100644 drivers/cpufreq/tegra124-cpufreq.c + rename drivers/cpufreq/{tegra-cpufreq.c => tegra20-cpufreq.c} (100%) + create mode 100644 drivers/soc/tegra/fuse/speedo-tegra210.c + create mode 100644 include/dt-bindings/reset/tegra124-car.h +Merging arm64/for-next/core (04d7e098f541 arm64: fix missing syscall trace exit) +$ git merge arm64/for-next/core +Removing arch/arm64/include/asm/alternative-asm.h +Merge made by the 'recursive' strategy. + Documentation/arm64/booting.txt | 10 +- + arch/arm/kvm/psci.c | 2 + + arch/arm/mm/init.c | 1 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/acpi.h | 19 +-- + arch/arm64/include/asm/alternative-asm.h | 29 ---- + arch/arm64/include/asm/alternative.h | 46 +++++- + arch/arm64/include/asm/boot.h | 14 ++ + arch/arm64/include/asm/cacheflush.h | 5 - + arch/arm64/include/asm/cpu_ops.h | 27 ++-- + arch/arm64/include/asm/fixmap.h | 15 ++ + arch/arm64/include/asm/insn.h | 3 + + arch/arm64/include/asm/io.h | 8 +- + arch/arm64/include/asm/mmu.h | 1 + + arch/arm64/include/asm/perf_event.h | 7 + + arch/arm64/include/asm/proc-fns.h | 4 - + arch/arm64/include/asm/processor.h | 19 ++- + arch/arm64/include/asm/psci.h | 12 +- + arch/arm64/include/asm/smp.h | 2 +- + arch/arm64/include/asm/smp_plat.h | 16 ++ + arch/arm64/include/asm/system_misc.h | 1 - + arch/arm64/kernel/acpi.c | 123 +--------------- + arch/arm64/kernel/alternative.c | 71 ++++++++- + arch/arm64/kernel/cpu_ops.c | 72 +++++---- + arch/arm64/kernel/cpuidle.c | 7 +- + arch/arm64/kernel/entry.S | 36 +++-- + arch/arm64/kernel/head.S | 52 +------ + arch/arm64/kernel/insn.c | 60 ++++++++ + arch/arm64/kernel/perf_event.c | 2 +- + arch/arm64/kernel/process.c | 59 +++----- + arch/arm64/kernel/psci.c | 242 ++++++++++++++++-------------- + arch/arm64/kernel/setup.c | 37 ++--- + arch/arm64/kernel/sleep.S | 9 +- + arch/arm64/kernel/smp.c | 246 +++++++++++++++++++++++-------- + arch/arm64/kernel/smp_spin_table.c | 8 +- + arch/arm64/kernel/suspend.c | 3 - + arch/arm64/kernel/vmlinux.lds.S | 11 +- + arch/arm64/mm/Makefile | 2 + + arch/arm64/mm/cache.S | 75 +--------- + arch/arm64/mm/flush.c | 1 - + arch/arm64/mm/mmu.c | 66 +++++++++ + arch/arm64/mm/proc.S | 46 ------ + arch/powerpc/kernel/prom.c | 1 + + drivers/of/fdt.c | 19 ++- + include/linux/of_fdt.h | 2 + + 45 files changed, 828 insertions(+), 664 deletions(-) + delete mode 100644 arch/arm64/include/asm/alternative-asm.h + create mode 100644 arch/arm64/include/asm/boot.h +Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (3083ca2376a7 c6x: platforms: cache: Export symbol L1P_cache_block_invalidate and L1D_cache_block_writeback) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (7a7c68de60cf CRISv10: delete unused lib/dmacopy.c) +$ git merge cris/for-next +Removing arch/cris/include/uapi/asm/types.h +Removing arch/cris/include/uapi/asm/statfs.h +Removing arch/cris/include/uapi/asm/sockios.h +Removing arch/cris/include/uapi/asm/socket.h +Removing arch/cris/include/uapi/asm/siginfo.h +Removing arch/cris/include/uapi/asm/shmbuf.h +Removing arch/cris/include/uapi/asm/sembuf.h +Removing arch/cris/include/uapi/asm/resource.h +Removing arch/cris/include/uapi/asm/poll.h +Removing arch/cris/include/uapi/asm/msgbuf.h +Removing arch/cris/include/uapi/asm/mman.h +Removing arch/cris/include/uapi/asm/kvm_para.h +Removing arch/cris/include/uapi/asm/ipcbuf.h +Removing arch/cris/include/uapi/asm/ioctl.h +Removing arch/cris/include/uapi/asm/fcntl.h +Removing arch/cris/include/uapi/asm/errno.h +Auto-merging arch/cris/include/uapi/asm/elf_v32.h +Auto-merging arch/cris/include/uapi/asm/elf_v10.h +Auto-merging arch/cris/include/uapi/asm/elf.h +Removing arch/cris/include/uapi/asm/bitsperlong.h +Removing arch/cris/include/uapi/asm/auxvec.h +Removing arch/cris/include/asm/types.h +Removing arch/cris/arch-v10/lib/old_checksum.c +Removing arch/cris/arch-v10/lib/dmacopy.c +Merge made by the 'recursive' strategy. + arch/cris/Kconfig | 12 +++ + arch/cris/arch-v10/kernel/entry.S | 8 ++ + arch/cris/arch-v10/lib/dmacopy.c | 42 ---------- + arch/cris/arch-v10/lib/old_checksum.c | 86 -------------------- + arch/cris/arch-v32/drivers/Kconfig | 16 ++-- + arch/cris/arch-v32/drivers/axisflashmap.c | 9 ++- + arch/cris/arch-v32/drivers/mach-a3/gpio.c | 4 +- + arch/cris/arch-v32/drivers/mach-fs/gpio.c | 3 +- + arch/cris/arch-v32/kernel/entry.S | 19 +++++ + arch/cris/arch-v32/kernel/process.c | 4 +- + arch/cris/arch-v32/kernel/signal.c | 1 - + arch/cris/arch-v32/mach-fs/pinmux.c | 8 +- + arch/cris/configs/artpec_3_defconfig | 5 +- + arch/cris/configs/etraxfs_defconfig | 1 + + arch/cris/include/arch-v32/arch/bug.h | 11 ++- + arch/cris/include/arch-v32/arch/irqflags.h | 2 +- + arch/cris/include/asm/Kbuild | 17 ++++ + arch/cris/include/asm/mmu_context.h | 9 ++- + arch/cris/include/asm/stacktrace.h | 8 ++ + arch/cris/include/asm/types.h | 12 --- + arch/cris/include/asm/unistd.h | 2 +- + arch/cris/include/uapi/asm/Kbuild | 5 ++ + arch/cris/include/uapi/asm/auxvec.h | 4 - + arch/cris/include/uapi/asm/bitsperlong.h | 1 - + arch/cris/include/{ => uapi}/asm/elf.h | 9 ++- + .../{arch-v10/arch/elf.h => uapi/asm/elf_v10.h} | 5 +- + .../{arch-v32/arch/elf.h => uapi/asm/elf_v32.h} | 5 +- + arch/cris/include/uapi/asm/errno.h | 6 -- + arch/cris/include/uapi/asm/fcntl.h | 1 - + arch/cris/include/uapi/asm/ioctl.h | 1 - + arch/cris/include/uapi/asm/ipcbuf.h | 1 - + arch/cris/include/uapi/asm/kvm_para.h | 1 - + arch/cris/include/uapi/asm/mman.h | 1 - + arch/cris/include/uapi/asm/msgbuf.h | 33 -------- + arch/cris/include/uapi/asm/poll.h | 1 - + arch/cris/include/uapi/asm/ptrace.h | 6 +- + .../arch/ptrace.h => uapi/asm/ptrace_v10.h} | 0 + .../arch/ptrace.h => uapi/asm/ptrace_v32.h} | 0 + arch/cris/include/uapi/asm/resource.h | 6 -- + arch/cris/include/uapi/asm/sembuf.h | 25 ------ + arch/cris/include/uapi/asm/shmbuf.h | 42 ---------- + arch/cris/include/uapi/asm/siginfo.h | 6 -- + arch/cris/include/uapi/asm/socket.h | 92 ---------------------- + arch/cris/include/uapi/asm/sockios.h | 13 --- + arch/cris/include/uapi/asm/statfs.h | 6 -- + arch/cris/include/uapi/asm/types.h | 1 - + arch/cris/include/uapi/asm/unistd.h | 8 ++ + arch/cris/kernel/Makefile | 1 + + arch/cris/kernel/irq.c | 6 +- + arch/cris/kernel/stacktrace.c | 76 ++++++++++++++++++ + 50 files changed, 220 insertions(+), 421 deletions(-) + delete mode 100644 arch/cris/arch-v10/lib/dmacopy.c + delete mode 100644 arch/cris/arch-v10/lib/old_checksum.c + create mode 100644 arch/cris/include/asm/stacktrace.h + delete mode 100644 arch/cris/include/asm/types.h + delete mode 100644 arch/cris/include/uapi/asm/auxvec.h + delete mode 100644 arch/cris/include/uapi/asm/bitsperlong.h + rename arch/cris/include/{ => uapi}/asm/elf.h (95%) + rename arch/cris/include/{arch-v10/arch/elf.h => uapi/asm/elf_v10.h} (98%) + rename arch/cris/include/{arch-v32/arch/elf.h => uapi/asm/elf_v32.h} (98%) + delete mode 100644 arch/cris/include/uapi/asm/errno.h + delete mode 100644 arch/cris/include/uapi/asm/fcntl.h + delete mode 100644 arch/cris/include/uapi/asm/ioctl.h + delete mode 100644 arch/cris/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/cris/include/uapi/asm/kvm_para.h + delete mode 100644 arch/cris/include/uapi/asm/mman.h + delete mode 100644 arch/cris/include/uapi/asm/msgbuf.h + delete mode 100644 arch/cris/include/uapi/asm/poll.h + rename arch/cris/include/{arch-v10/arch/ptrace.h => uapi/asm/ptrace_v10.h} (100%) + rename arch/cris/include/{arch-v32/arch/ptrace.h => uapi/asm/ptrace_v32.h} (100%) + delete mode 100644 arch/cris/include/uapi/asm/resource.h + delete mode 100644 arch/cris/include/uapi/asm/sembuf.h + delete mode 100644 arch/cris/include/uapi/asm/shmbuf.h + delete mode 100644 arch/cris/include/uapi/asm/siginfo.h + delete mode 100644 arch/cris/include/uapi/asm/socket.h + delete mode 100644 arch/cris/include/uapi/asm/sockios.h + delete mode 100644 arch/cris/include/uapi/asm/statfs.h + delete mode 100644 arch/cris/include/uapi/asm/types.h + create mode 100644 arch/cris/kernel/stacktrace.c +Merging h8300/h8300-next (2ced81d35808 h8300: fix typo.) +$ git merge h8300/h8300-next +Resolved 'drivers/clocksource/Kconfig' using previous resolution. +Resolved 'drivers/irqchip/Makefile' using previous resolution. +Auto-merging drivers/irqchip/Makefile +CONFLICT (content): Merge conflict in drivers/irqchip/Makefile +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig +Auto-merging drivers/clk/Makefile +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ea58af2219b2] Merge remote-tracking branch 'h8300/h8300-next' +$ git diff -M --stat --summary HEAD^.. + CREDITS | 5 - + .../bindings/clock/renesas,h8300-div-clock.txt | 24 ++ + .../bindings/clock/renesas,h8s2678-pll-clock.txt | 23 ++ + Documentation/devicetree/bindings/h8300/cpu.txt | 13 + + .../interrupt-controller/renesas,h8300h-intc.txt | 22 ++ + .../interrupt-controller/renesas,h8s-intc.txt | 22 ++ + .../memory-controllers/renesas,h8300-bsc.txt | 12 + + .../bindings/serial/renesas,sci-serial.txt | 1 + + .../bindings/timer/renesas,16bit-timer.txt | 25 ++ + .../bindings/timer/renesas,8bit-timer.txt | 25 ++ + .../devicetree/bindings/timer/renesas,tpu.txt | 21 ++ + MAINTAINERS | 11 + + arch/h8300/Kconfig | 76 ++++ + arch/h8300/Kconfig.cpu | 99 +++++ + arch/h8300/Makefile | 55 +++ + arch/h8300/boot/Makefile | 26 ++ + arch/h8300/boot/compressed/Makefile | 37 ++ + arch/h8300/boot/compressed/head.S | 48 +++ + arch/h8300/boot/compressed/misc.c | 74 ++++ + arch/h8300/boot/compressed/vmlinux.lds | 32 ++ + arch/h8300/boot/compressed/vmlinux.scr | 9 + + arch/h8300/boot/dts/Makefile | 12 + + arch/h8300/boot/dts/edosk2674.dts | 107 ++++++ + arch/h8300/boot/dts/h8300h_sim.dts | 96 +++++ + arch/h8300/boot/dts/h8s_sim.dts | 99 +++++ + arch/h8300/configs/edosk2674_defconfig | 49 +++ + arch/h8300/configs/h8300h-sim_defconfig | 49 +++ + arch/h8300/configs/h8s-sim_defconfig | 49 +++ + arch/h8300/include/asm/Kbuild | 75 ++++ + arch/h8300/include/asm/atomic.h | 159 ++++++++ + arch/h8300/include/asm/bitops.h | 185 +++++++++ + arch/h8300/include/asm/bitsperlong.h | 14 + + arch/h8300/include/asm/bug.h | 12 + + arch/h8300/include/asm/byteorder.h | 7 + + arch/h8300/include/asm/cache.h | 11 + + arch/h8300/include/asm/cmpxchg.h | 65 ++++ + arch/h8300/include/asm/dma-mapping.h | 57 +++ + arch/h8300/include/asm/elf.h | 101 +++++ + arch/h8300/include/asm/flat.h | 28 ++ + arch/h8300/include/asm/io.h | 57 +++ + arch/h8300/include/asm/irq.h | 26 ++ + arch/h8300/include/asm/irqflags.h | 96 +++++ + arch/h8300/include/asm/mc146818rtc.h | 9 + + arch/h8300/include/asm/mutex.h | 9 + + arch/h8300/include/asm/page.h | 18 + + arch/h8300/include/asm/page_offset.h | 2 + + arch/h8300/include/asm/pci.h | 19 + + arch/h8300/include/asm/pgtable.h | 49 +++ + arch/h8300/include/asm/processor.h | 144 +++++++ + arch/h8300/include/asm/ptrace.h | 36 ++ + arch/h8300/include/asm/segment.h | 45 +++ + arch/h8300/include/asm/signal.h | 22 ++ + arch/h8300/include/asm/smp.h | 1 + + arch/h8300/include/asm/string.h | 17 + + arch/h8300/include/asm/switch_to.h | 51 +++ + arch/h8300/include/asm/syscall.h | 56 +++ + arch/h8300/include/asm/thread_info.h | 111 ++++++ + arch/h8300/include/asm/tlb.h | 8 + + arch/h8300/include/asm/traps.h | 41 ++ + arch/h8300/include/asm/user.h | 74 ++++ + arch/h8300/include/uapi/asm/Kbuild | 30 ++ + arch/h8300/include/uapi/asm/byteorder.h | 6 + + arch/h8300/include/uapi/asm/ptrace.h | 42 +++ + arch/h8300/include/uapi/asm/sigcontext.h | 18 + + arch/h8300/include/uapi/asm/signal.h | 115 ++++++ + arch/h8300/include/uapi/asm/unistd.h | 3 + + arch/h8300/kernel/Makefile | 19 + + arch/h8300/kernel/asm-offsets.c | 67 ++++ + arch/h8300/kernel/dma.c | 69 ++++ + arch/h8300/kernel/entry.S | 414 +++++++++++++++++++++ + arch/h8300/kernel/h8300_ksyms.c | 36 ++ + arch/h8300/kernel/head_ram.S | 60 +++ + arch/h8300/kernel/head_rom.S | 110 ++++++ + arch/h8300/kernel/irq.c | 97 +++++ + arch/h8300/kernel/module.c | 70 ++++ + arch/h8300/kernel/process.c | 171 +++++++++ + arch/h8300/kernel/ptrace.c | 203 ++++++++++ + arch/h8300/kernel/ptrace_h.c | 256 +++++++++++++ + arch/h8300/kernel/ptrace_s.c | 44 +++ + arch/h8300/kernel/setup.c | 255 +++++++++++++ + arch/h8300/kernel/signal.c | 289 ++++++++++++++ + arch/h8300/kernel/sim-console.c | 79 ++++ + arch/h8300/kernel/syscalls.c | 14 + + arch/h8300/kernel/traps.c | 161 ++++++++ + arch/h8300/kernel/vmlinux.lds.S | 67 ++++ + arch/h8300/lib/Makefile | 8 + + arch/h8300/lib/abs.S | 20 + + arch/h8300/lib/ashldi3.c | 24 ++ + arch/h8300/lib/ashrdi3.c | 24 ++ + arch/h8300/lib/delay.c | 40 ++ + arch/h8300/lib/libgcc.h | 77 ++++ + arch/h8300/lib/lshrdi3.c | 23 ++ + arch/h8300/lib/memcpy.S | 85 +++++ + arch/h8300/lib/memset.S | 69 ++++ + arch/h8300/lib/moddivsi3.S | 72 ++++ + arch/h8300/lib/modsi3.S | 72 ++++ + arch/h8300/lib/muldi3.c | 44 +++ + arch/h8300/lib/mulsi3.S | 38 ++ + arch/h8300/lib/strncpy.S | 34 ++ + arch/h8300/lib/ucmpdi2.c | 17 + + arch/h8300/lib/udivsi3.S | 76 ++++ + arch/h8300/mm/Makefile | 5 + + arch/h8300/mm/fault.c | 57 +++ + arch/h8300/mm/init.c | 128 +++++++ + arch/h8300/mm/memory.c | 53 +++ + drivers/clk/Makefile | 1 + + drivers/clk/h8300/Makefile | 2 + + drivers/clk/h8300/clk-div.c | 53 +++ + drivers/clk/h8300/clk-h8s2678.c | 146 ++++++++ + drivers/clocksource/Kconfig | 6 + + drivers/clocksource/Makefile | 3 + + drivers/clocksource/h8300_timer16.c | 254 +++++++++++++ + drivers/clocksource/h8300_timer8.c | 313 ++++++++++++++++ + drivers/clocksource/h8300_tpu.c | 207 +++++++++++ + drivers/irqchip/Kconfig | 8 + + drivers/irqchip/Makefile | 2 + + drivers/irqchip/irq-renesas-h8300h.c | 95 +++++ + drivers/irqchip/irq-renesas-h8s.c | 101 +++++ + drivers/tty/serial/Kconfig | 2 +- + drivers/tty/serial/sh-sci.c | 40 +- + include/asm-generic/asm-offsets.h | 1 + + include/uapi/linux/elf-em.h | 1 + + scripts/mksysmap | 2 +- + 123 files changed, 7596 insertions(+), 28 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/renesas,h8300-div-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/renesas,h8s2678-pll-clock.txt + create mode 100644 Documentation/devicetree/bindings/h8300/cpu.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,h8300h-intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,h8s-intc.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.txt + create mode 100644 Documentation/devicetree/bindings/timer/renesas,16bit-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/renesas,8bit-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/renesas,tpu.txt + create mode 100644 arch/h8300/Kconfig + create mode 100644 arch/h8300/Kconfig.cpu + create mode 100644 arch/h8300/Makefile + create mode 100644 arch/h8300/boot/Makefile + create mode 100644 arch/h8300/boot/compressed/Makefile + create mode 100644 arch/h8300/boot/compressed/head.S + create mode 100644 arch/h8300/boot/compressed/misc.c + create mode 100644 arch/h8300/boot/compressed/vmlinux.lds + create mode 100644 arch/h8300/boot/compressed/vmlinux.scr + create mode 100644 arch/h8300/boot/dts/Makefile + create mode 100644 arch/h8300/boot/dts/edosk2674.dts + create mode 100644 arch/h8300/boot/dts/h8300h_sim.dts + create mode 100644 arch/h8300/boot/dts/h8s_sim.dts + create mode 100644 arch/h8300/configs/edosk2674_defconfig + create mode 100644 arch/h8300/configs/h8300h-sim_defconfig + create mode 100644 arch/h8300/configs/h8s-sim_defconfig + create mode 100644 arch/h8300/include/asm/Kbuild + create mode 100644 arch/h8300/include/asm/atomic.h + create mode 100644 arch/h8300/include/asm/bitops.h + create mode 100644 arch/h8300/include/asm/bitsperlong.h + create mode 100644 arch/h8300/include/asm/bug.h + create mode 100644 arch/h8300/include/asm/byteorder.h + create mode 100644 arch/h8300/include/asm/cache.h + create mode 100644 arch/h8300/include/asm/cmpxchg.h + create mode 100644 arch/h8300/include/asm/dma-mapping.h + create mode 100644 arch/h8300/include/asm/elf.h + create mode 100644 arch/h8300/include/asm/flat.h + create mode 100644 arch/h8300/include/asm/io.h + create mode 100644 arch/h8300/include/asm/irq.h + create mode 100644 arch/h8300/include/asm/irqflags.h + create mode 100644 arch/h8300/include/asm/mc146818rtc.h + create mode 100644 arch/h8300/include/asm/mutex.h + create mode 100644 arch/h8300/include/asm/page.h + create mode 100644 arch/h8300/include/asm/page_offset.h + create mode 100644 arch/h8300/include/asm/pci.h + create mode 100644 arch/h8300/include/asm/pgtable.h + create mode 100644 arch/h8300/include/asm/processor.h + create mode 100644 arch/h8300/include/asm/ptrace.h + create mode 100644 arch/h8300/include/asm/segment.h + create mode 100644 arch/h8300/include/asm/signal.h + create mode 100644 arch/h8300/include/asm/smp.h + create mode 100644 arch/h8300/include/asm/string.h + create mode 100644 arch/h8300/include/asm/switch_to.h + create mode 100644 arch/h8300/include/asm/syscall.h + create mode 100644 arch/h8300/include/asm/thread_info.h + create mode 100644 arch/h8300/include/asm/tlb.h + create mode 100644 arch/h8300/include/asm/traps.h + create mode 100644 arch/h8300/include/asm/user.h + create mode 100644 arch/h8300/include/uapi/asm/Kbuild + create mode 100644 arch/h8300/include/uapi/asm/byteorder.h + create mode 100644 arch/h8300/include/uapi/asm/ptrace.h + create mode 100644 arch/h8300/include/uapi/asm/sigcontext.h + create mode 100644 arch/h8300/include/uapi/asm/signal.h + create mode 100644 arch/h8300/include/uapi/asm/unistd.h + create mode 100644 arch/h8300/kernel/Makefile + create mode 100644 arch/h8300/kernel/asm-offsets.c + create mode 100644 arch/h8300/kernel/dma.c + create mode 100644 arch/h8300/kernel/entry.S + create mode 100644 arch/h8300/kernel/h8300_ksyms.c + create mode 100644 arch/h8300/kernel/head_ram.S + create mode 100644 arch/h8300/kernel/head_rom.S + create mode 100644 arch/h8300/kernel/irq.c + create mode 100644 arch/h8300/kernel/module.c + create mode 100644 arch/h8300/kernel/process.c + create mode 100644 arch/h8300/kernel/ptrace.c + create mode 100644 arch/h8300/kernel/ptrace_h.c + create mode 100644 arch/h8300/kernel/ptrace_s.c + create mode 100644 arch/h8300/kernel/setup.c + create mode 100644 arch/h8300/kernel/signal.c + create mode 100644 arch/h8300/kernel/sim-console.c + create mode 100644 arch/h8300/kernel/syscalls.c + create mode 100644 arch/h8300/kernel/traps.c + create mode 100644 arch/h8300/kernel/vmlinux.lds.S + create mode 100644 arch/h8300/lib/Makefile + create mode 100644 arch/h8300/lib/abs.S + create mode 100644 arch/h8300/lib/ashldi3.c + create mode 100644 arch/h8300/lib/ashrdi3.c + create mode 100644 arch/h8300/lib/delay.c + create mode 100644 arch/h8300/lib/libgcc.h + create mode 100644 arch/h8300/lib/lshrdi3.c + create mode 100644 arch/h8300/lib/memcpy.S + create mode 100644 arch/h8300/lib/memset.S + create mode 100644 arch/h8300/lib/moddivsi3.S + create mode 100644 arch/h8300/lib/modsi3.S + create mode 100644 arch/h8300/lib/muldi3.c + create mode 100644 arch/h8300/lib/mulsi3.S + create mode 100644 arch/h8300/lib/strncpy.S + create mode 100644 arch/h8300/lib/ucmpdi2.c + create mode 100644 arch/h8300/lib/udivsi3.S + create mode 100644 arch/h8300/mm/Makefile + create mode 100644 arch/h8300/mm/fault.c + create mode 100644 arch/h8300/mm/init.c + create mode 100644 arch/h8300/mm/memory.c + create mode 100644 drivers/clk/h8300/Makefile + create mode 100644 drivers/clk/h8300/clk-div.c + create mode 100644 drivers/clk/h8300/clk-h8s2678.c + create mode 100644 drivers/clocksource/h8300_timer16.c + create mode 100644 drivers/clocksource/h8300_timer8.c + create mode 100644 drivers/clocksource/h8300_tpu.c + create mode 100644 drivers/irqchip/irq-renesas-h8300h.c + create mode 100644 drivers/irqchip/irq-renesas-h8s.c + create mode 100644 include/asm-generic/asm-offsets.h +Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (078550569eaf ramoops: make it possible to change mem_type param.) +$ git merge ia64/next +Merge made by the 'recursive' strategy. + fs/pstore/platform.c | 8 +++++++- + fs/pstore/ram.c | 50 ++++++++++++++++++++++++++++++++------------------ + 2 files changed, 39 insertions(+), 19 deletions(-) +Merging m68k/for-next (1214c525484c m68k: Use for_each_sg()) +$ git merge m68k/for-next +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/kernel/dma.c | 19 ++++++++++++------- + 13 files changed, 84 insertions(+), 31 deletions(-) +Merging m68knommu/for-next (ba155e2d21f6 Linux 4.1-rc5) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (40346a0327fe metag: copy_thread(): rename 'arg' argument to 'kthread_arg') +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (c4fa9a6ae285 microblaze/PCI: Remove unnecessary struct pci_dev declaration) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/pci.h | 17 ----------------- + arch/microblaze/kernel/cpu/cpuinfo.c | 2 ++ + arch/microblaze/kernel/dma.c | 1 + + arch/microblaze/kernel/kgdb.c | 2 +- + 4 files changed, 4 insertions(+), 18 deletions(-) +Merging mips/mips-for-linux-next (a17cc7e49f75 Merge branch '4.1-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Resolved 'drivers/clk/Makefile' using previous resolution. +Resolved 'drivers/irqchip/Kconfig' using previous resolution. +Resolved 'drivers/irqchip/Makefile' using previous resolution. +Auto-merging include/linux/irqchip/ingenic.h +Auto-merging drivers/irqchip/irq-mips-cpu.c +Auto-merging drivers/irqchip/Makefile +CONFLICT (content): Merge conflict in drivers/irqchip/Makefile +Auto-merging drivers/irqchip/Kconfig +CONFLICT (content): Merge conflict in drivers/irqchip/Kconfig +Auto-merging drivers/clk/Makefile +CONFLICT (content): Merge conflict in drivers/clk/Makefile +Auto-merging arch/mips/loongson64/common/serial.c +Auto-merging arch/mips/loongson64/common/Makefile +Auto-merging arch/mips/loongson64/Platform +Auto-merging arch/mips/loongson64/Makefile +Auto-merging arch/mips/loongson64/Kconfig +Auto-merging arch/mips/loongson32/Platform +Auto-merging arch/mips/loongson32/Makefile +Auto-merging arch/mips/loongson32/Kconfig +Removing arch/mips/jz4740/serial.h +Removing arch/mips/jz4740/serial.c +Removing arch/mips/jz4740/irq.c +Removing arch/mips/jz4740/clock.h +Removing arch/mips/jz4740/clock.c +Removing arch/mips/jz4740/clock-debugfs.c +Auto-merging arch/mips/include/asm/mach-loongson64/spaces.h +Auto-merging arch/mips/include/asm/mach-loongson64/pci.h +Auto-merging arch/mips/include/asm/mach-loongson64/mem.h +Auto-merging arch/mips/include/asm/mach-loongson64/mc146818rtc.h +Auto-merging arch/mips/include/asm/mach-loongson64/machine.h +Auto-merging arch/mips/include/asm/mach-loongson64/loongson.h +Auto-merging arch/mips/include/asm/mach-loongson64/kernel-entry-init.h +Auto-merging arch/mips/include/asm/mach-loongson64/irq.h +Auto-merging arch/mips/include/asm/mach-loongson64/dma-coherence.h +Auto-merging arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h +Auto-merging arch/mips/include/asm/mach-loongson64/boot_param.h +Auto-merging arch/mips/include/asm/mach-loongson32/regs-wdt.h +Auto-merging arch/mips/include/asm/mach-loongson32/regs-pwm.h +Auto-merging arch/mips/include/asm/mach-loongson32/regs-mux.h +Auto-merging arch/mips/include/asm/mach-loongson32/regs-clk.h +Auto-merging arch/mips/include/asm/mach-loongson32/prom.h +Auto-merging arch/mips/include/asm/mach-loongson32/platform.h +Auto-merging arch/mips/include/asm/mach-loongson32/loongson1.h +Auto-merging arch/mips/include/asm/mach-loongson32/irq.h +Auto-merging arch/mips/include/asm/mach-loongson32/cpufreq.h +Removing arch/mips/include/asm/mach-loongson/workarounds.h +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ea37862254c5] Merge remote-tracking branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/clock/ingenic,cgu.txt | 53 ++ + .../devicetree/bindings/clock/qca,ath79-pll.txt | 33 + + .../devicetree/bindings/gpio/gpio-ath79.txt | 38 + + .../bindings/interrupt-controller/ingenic,intc.txt | 28 + + .../interrupt-controller/qca,ath79-cpu-intc.txt | 44 + + .../interrupt-controller/qca,ath79-misc-intc.txt | 30 + + .../memory-controllers/ath79-ddr-controller.txt | 35 + + .../devicetree/bindings/mips/ath79-soc.txt | 21 + + .../devicetree/bindings/phy/pistachio-usb-phy.txt | 29 + + .../devicetree/bindings/serial/ingenic,uart.txt | 22 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + MAINTAINERS | 8 + + arch/mips/Kbuild.platforms | 4 +- + arch/mips/Kconfig | 163 ++-- + arch/mips/alchemy/common/clock.c | 6 +- + arch/mips/ath25/ar2315.c | 2 +- + arch/mips/ath25/ar5312.c | 2 +- + arch/mips/ath25/board.c | 2 +- + arch/mips/ath79/Kconfig | 12 + + arch/mips/ath79/clock.c | 86 +- + arch/mips/ath79/common.c | 35 +- + arch/mips/ath79/common.h | 1 + + arch/mips/ath79/dev-common.c | 51 ++ + arch/mips/ath79/gpio.c | 79 +- + arch/mips/ath79/irq.c | 200 ++--- + arch/mips/ath79/machtypes.h | 1 + + arch/mips/ath79/setup.c | 30 +- + arch/mips/bcm47xx/Kconfig | 1 - + arch/mips/bcm47xx/board.c | 1 + + arch/mips/bcm47xx/buttons.c | 11 + + arch/mips/bcm47xx/leds.c | 14 + + arch/mips/bcm47xx/nvram.c | 79 +- + arch/mips/bcm47xx/prom.c | 2 +- + arch/mips/bcm47xx/setup.c | 3 - + arch/mips/bcm47xx/sprom.c | 53 +- + arch/mips/bmips/Kconfig | 4 + + arch/mips/bmips/setup.c | 2 + + arch/mips/boot/compressed/head.S | 16 + + arch/mips/boot/compressed/ld.script | 6 +- + arch/mips/boot/compressed/uart-16550.c | 2 +- + arch/mips/boot/dts/Makefile | 2 + + arch/mips/boot/dts/brcm/Makefile | 14 + + arch/mips/boot/dts/brcm/bcm7346.dtsi | 26 + + arch/mips/boot/dts/brcm/bcm7358.dtsi | 26 + + arch/mips/boot/dts/brcm/bcm7360.dtsi | 26 + + arch/mips/boot/dts/brcm/bcm7362.dtsi | 26 + + arch/mips/boot/dts/brcm/bcm7435.dtsi | 239 ++++++ + arch/mips/boot/dts/brcm/bcm97346dbsmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97358svmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97360svmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97362svmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97435svmb.dts | 60 ++ + arch/mips/boot/dts/ingenic/Makefile | 10 + + arch/mips/boot/dts/ingenic/ci20.dts | 44 + + arch/mips/boot/dts/ingenic/jz4740.dtsi | 68 ++ + arch/mips/boot/dts/ingenic/jz4780.dtsi | 111 +++ + arch/mips/boot/dts/ingenic/qi_lb60.dts | 15 + + arch/mips/boot/dts/mti/Makefile | 1 + + arch/mips/boot/dts/mti/malta.dts | 7 + + arch/mips/boot/dts/qca/Makefile | 11 + + arch/mips/boot/dts/qca/ar9132.dtsi | 133 +++ + arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 112 +++ + arch/mips/cavium-octeon/octeon-irq.c | 4 +- + arch/mips/cobalt/Makefile | 3 +- + arch/mips/configs/ci20_defconfig | 162 ++++ + arch/mips/configs/fuloong2e_defconfig | 2 +- + arch/mips/configs/lemote2f_defconfig | 2 +- + arch/mips/configs/loongson3_defconfig | 2 +- + arch/mips/configs/ls1b_defconfig | 2 +- + arch/mips/configs/maltasmvp_defconfig | 17 +- + arch/mips/configs/pistachio_defconfig | 1 + + arch/mips/configs/qi_lb60_defconfig | 3 +- + arch/mips/include/asm/bitops.h | 2 +- + arch/mips/include/asm/bmips-spaces.h | 7 + + arch/mips/include/asm/cpu-features.h | 3 + + arch/mips/include/asm/cpu-type.h | 2 +- + arch/mips/include/asm/cpu.h | 7 +- + arch/mips/include/asm/hazards.h | 52 ++ + arch/mips/include/asm/i8259.h | 1 + + arch/mips/include/asm/irqflags.h | 4 +- + arch/mips/include/asm/kgdb.h | 1 - + arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 12 +- + arch/mips/include/asm/mach-ath79/ath79.h | 3 +- + arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 4 - + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 2 + + arch/mips/include/asm/mach-bcm63xx/spaces.h | 2 +- + arch/mips/include/asm/mach-bmips/spaces.h | 2 +- + .../include/asm/mach-dec/cpu-feature-overrides.h | 16 + + arch/mips/include/asm/mach-generic/irq.h | 4 +- + arch/mips/include/asm/mach-generic/spaces.h | 4 + + .../include/asm/mach-ip27/cpu-feature-overrides.h | 92 +- + arch/mips/include/asm/mach-jz4740/clock.h | 3 + + .../asm/mach-jz4740/cpu-feature-overrides.h | 3 - + arch/mips/include/asm/mach-jz4740/irq.h | 14 +- + arch/mips/include/asm/mach-jz4740/platform.h | 2 - + arch/mips/include/asm/mach-loongson/workarounds.h | 7 - + .../{mach-loongson1 => mach-loongson32}/cpufreq.h | 6 +- + .../asm/{mach-loongson1 => mach-loongson32}/irq.h | 6 +- + .../loongson1.h | 6 +- + .../{mach-loongson1 => mach-loongson32}/platform.h | 6 +- + .../asm/{mach-loongson1 => mach-loongson32}/prom.h | 6 +- + .../{mach-loongson1 => mach-loongson32}/regs-clk.h | 6 +- + .../{mach-loongson1 => mach-loongson32}/regs-mux.h | 6 +- + .../{mach-loongson1 => mach-loongson32}/regs-pwm.h | 6 +- + .../{mach-loongson1 => mach-loongson32}/regs-wdt.h | 6 +- + .../boot_param.h | 4 +- + .../cpu-feature-overrides.h | 6 +- + .../cs5536/cs5536.h | 0 + .../cs5536/cs5536_mfgpt.h | 0 + .../cs5536/cs5536_pci.h | 0 + .../cs5536/cs5536_vsm.h | 0 + .../dma-coherence.h | 6 +- + .../asm/{mach-loongson => mach-loongson64}/gpio.h | 0 + .../asm/{mach-loongson => mach-loongson64}/irq.h | 6 +- + .../kernel-entry-init.h | 6 +- + .../{mach-loongson => mach-loongson64}/loongson.h | 6 +- + .../loongson_hwmon.h | 0 + .../{mach-loongson => mach-loongson64}/machine.h | 6 +- + .../mc146818rtc.h | 6 +- + .../asm/{mach-loongson => mach-loongson64}/mem.h | 6 +- + .../{mach-loongson => mach-loongson64}/mmzone.h | 0 + .../asm/{mach-loongson => mach-loongson64}/pci.h | 6 +- + .../{mach-loongson => mach-loongson64}/spaces.h | 4 +- + .../{mach-loongson => mach-loongson64}/topology.h | 0 + .../mips/include/asm/mach-loongson64/workarounds.h | 7 + + arch/mips/include/asm/mips-cm.h | 5 + + arch/mips/include/asm/mipsregs.h | 35 + + arch/mips/include/asm/pgtable-32.h | 2 +- + arch/mips/include/asm/pgtable-bits.h | 14 +- + arch/mips/include/asm/prom.h | 2 +- + arch/mips/include/asm/spinlock.h | 2 +- + arch/mips/include/asm/switch_to.h | 2 +- + arch/mips/include/asm/txx9irq.h | 2 +- + arch/mips/include/asm/uaccess.h | 47 +- + arch/mips/include/asm/xtalk/xwidget.h | 112 +++ + arch/mips/jz4740/Kconfig | 17 +- + arch/mips/jz4740/Makefile | 8 +- + arch/mips/jz4740/Platform | 8 +- + arch/mips/jz4740/board-qi_lb60.c | 7 - + arch/mips/jz4740/clock-debugfs.c | 108 --- + arch/mips/jz4740/clock.c | 924 --------------------- + arch/mips/jz4740/clock.h | 76 -- + arch/mips/jz4740/gpio.c | 7 +- + arch/mips/jz4740/irq.c | 162 ---- + arch/mips/jz4740/platform.c | 38 +- + arch/mips/jz4740/pm.c | 2 - + arch/mips/jz4740/prom.c | 13 - + arch/mips/jz4740/reset.c | 13 +- + arch/mips/jz4740/serial.c | 33 - + arch/mips/jz4740/serial.h | 23 - + arch/mips/jz4740/setup.c | 36 +- + arch/mips/jz4740/time.c | 19 +- + arch/mips/kernel/Makefile | 2 +- + arch/mips/kernel/cpu-probe.c | 12 +- + arch/mips/kernel/head.S | 16 + + arch/mips/kernel/i8259.c | 43 +- + arch/mips/kernel/irq.c | 52 -- + arch/mips/kernel/kgdb.c | 4 - + arch/mips/kernel/prom.c | 1 + + arch/mips/kernel/sysrq.c | 77 ++ + arch/mips/kernel/traps.c | 12 +- + arch/mips/kernel/vmlinux.lds.S | 8 +- + arch/mips/lib/dump_tlb.c | 110 ++- + arch/mips/lib/r3k_dump_tlb.c | 15 +- + arch/mips/{loongson1 => loongson32}/Kconfig | 6 +- + arch/mips/{loongson1 => loongson32}/Makefile | 2 +- + arch/mips/{loongson1 => loongson32}/Platform | 4 +- + .../mips/{loongson1 => loongson32}/common/Makefile | 0 + arch/mips/{loongson1 => loongson32}/common/irq.c | 0 + .../{loongson1 => loongson32}/common/platform.c | 0 + arch/mips/{loongson1 => loongson32}/common/prom.c | 0 + arch/mips/{loongson1 => loongson32}/common/reset.c | 0 + arch/mips/{loongson1 => loongson32}/common/setup.c | 0 + arch/mips/{loongson1 => loongson32}/common/time.c | 0 + arch/mips/{loongson1 => loongson32}/ls1b/Makefile | 0 + arch/mips/{loongson1 => loongson32}/ls1b/board.c | 0 + arch/mips/{loongson => loongson64}/Kconfig | 10 +- + arch/mips/{loongson => loongson64}/Makefile | 2 +- + arch/mips/{loongson => loongson64}/Platform | 4 +- + arch/mips/{loongson => loongson64}/common/Makefile | 4 +- + .../{loongson => loongson64}/common/bonito-irq.c | 0 + .../mips/{loongson => loongson64}/common/cmdline.c | 0 + .../common/cs5536/Makefile | 0 + .../common/cs5536/cs5536_acc.c | 0 + .../common/cs5536/cs5536_ehci.c | 0 + .../common/cs5536/cs5536_ide.c | 0 + .../common/cs5536/cs5536_isa.c | 0 + .../common/cs5536/cs5536_mfgpt.c | 0 + .../common/cs5536/cs5536_ohci.c | 0 + .../common/cs5536/cs5536_pci.c | 0 + .../{loongson => loongson64}/common/dma-swiotlb.c | 0 + .../{loongson => loongson64}/common/early_printk.c | 0 + arch/mips/{loongson => loongson64}/common/env.c | 0 + arch/mips/{loongson => loongson64}/common/init.c | 0 + arch/mips/{loongson => loongson64}/common/irq.c | 0 + .../{loongson => loongson64}/common/machtype.c | 0 + arch/mips/{loongson => loongson64}/common/mem.c | 0 + arch/mips/{loongson => loongson64}/common/pci.c | 0 + .../{loongson => loongson64}/common/platform.c | 0 + arch/mips/{loongson => loongson64}/common/pm.c | 0 + arch/mips/{loongson => loongson64}/common/reset.c | 0 + arch/mips/{loongson => loongson64}/common/rtc.c | 0 + arch/mips/{loongson => loongson64}/common/serial.c | 9 +- + arch/mips/{loongson => loongson64}/common/setup.c | 0 + arch/mips/{loongson => loongson64}/common/time.c | 0 + .../{loongson => loongson64}/common/uart_base.c | 0 + .../{loongson => loongson64}/fuloong-2e/Makefile | 0 + .../mips/{loongson => loongson64}/fuloong-2e/irq.c | 0 + .../{loongson => loongson64}/fuloong-2e/reset.c | 0 + .../{loongson => loongson64}/lemote-2f/Makefile | 0 + .../{loongson => loongson64}/lemote-2f/clock.c | 0 + .../lemote-2f/ec_kb3310b.c | 0 + .../lemote-2f/ec_kb3310b.h | 0 + arch/mips/{loongson => loongson64}/lemote-2f/irq.c | 0 + .../{loongson => loongson64}/lemote-2f/machtype.c | 0 + arch/mips/{loongson => loongson64}/lemote-2f/pm.c | 0 + .../{loongson => loongson64}/lemote-2f/reset.c | 0 + .../{loongson => loongson64}/loongson-3/Makefile | 0 + .../{loongson => loongson64}/loongson-3/cop2-ex.c | 0 + .../{loongson => loongson64}/loongson-3/hpet.c | 0 + .../mips/{loongson => loongson64}/loongson-3/irq.c | 0 + .../{loongson => loongson64}/loongson-3/numa.c | 0 + .../{loongson => loongson64}/loongson-3/platform.c | 0 + .../mips/{loongson => loongson64}/loongson-3/smp.c | 0 + .../mips/{loongson => loongson64}/loongson-3/smp.h | 0 + arch/mips/mm/c-r4k.c | 2 +- + arch/mips/mm/c-tx39.c | 4 - + arch/mips/mm/dma-default.c | 30 +- + arch/mips/mm/tlb-r3k.c | 37 +- + arch/mips/mm/tlb-r4k.c | 2 +- + arch/mips/mm/tlbex.c | 33 +- + arch/mips/mti-malta/Makefile | 2 +- + arch/mips/mti-malta/malta-dt.c | 34 + + arch/mips/mti-malta/malta-setup.c | 4 + + arch/mips/net/Makefile | 2 +- + arch/mips/net/bpf_jit.c | 262 ++---- + arch/mips/net/bpf_jit.h | 42 +- + arch/mips/net/bpf_jit_asm.S | 238 ++++++ + arch/mips/netlogic/xlr/platform-flash.c | 3 - + arch/mips/pci/pci-ar2315.c | 2 +- + arch/mips/pci/pci-ar71xx.c | 12 +- + arch/mips/pci/pci-ar724x.c | 2 +- + arch/mips/pci/pci-rt3883.c | 2 +- + arch/mips/ralink/irq.c | 2 +- + arch/mips/sgi-ip27/Makefile | 6 +- + arch/mips/sgi-ip27/ip27-irqno.c | 48 ++ + arch/mips/sibyte/Kconfig | 16 +- + arch/mips/txx9/Kconfig | 2 +- + arch/mips/vr41xx/Kconfig | 10 +- + drivers/clk/Makefile | 3 +- + drivers/clk/ingenic/Makefile | 3 + + drivers/clk/ingenic/cgu.c | 711 ++++++++++++++++ + drivers/clk/ingenic/cgu.h | 223 +++++ + drivers/clk/ingenic/jz4740-cgu.c | 303 +++++++ + drivers/clk/ingenic/jz4780-cgu.c | 733 ++++++++++++++++ + drivers/cpufreq/ls1x-cpufreq.c | 4 +- + drivers/irqchip/Kconfig | 12 +- + drivers/irqchip/Makefile | 2 + + drivers/irqchip/irq-ingenic.c | 177 ++++ + .../irq_cpu.c => drivers/irqchip/irq-mips-cpu.c | 3 + + drivers/phy/Kconfig | 7 + + drivers/phy/Makefile | 1 + + drivers/phy/phy-pistachio-usb.c | 206 +++++ + drivers/rtc/Kconfig | 2 +- + drivers/rtc/rtc-ls1x.c | 2 +- + drivers/ssb/driver_chipcommon_pmu.c | 6 +- + drivers/tty/serial/8250/8250_ingenic.c | 266 ++++++ + drivers/tty/serial/8250/Kconfig | 9 + + drivers/tty/serial/8250/Makefile | 3 + + drivers/tty/sysrq.c | 1 + + drivers/usb/host/Kconfig | 4 +- + include/dt-bindings/clock/jz4740-cgu.h | 37 + + include/dt-bindings/clock/jz4780-cgu.h | 88 ++ + include/dt-bindings/phy/phy-pistachio-usb.h | 16 + + include/linux/bcm47xx_nvram.h | 15 + + .../irq.h => include/linux/irqchip/ingenic.h | 8 +- + include/linux/platform_data/gpio-ath79.h | 19 + + include/linux/ssb/ssb.h | 8 +- + 278 files changed, 6238 insertions(+), 2286 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/ingenic,cgu.txt + create mode 100644 Documentation/devicetree/bindings/clock/qca,ath79-pll.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-ath79.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ingenic,intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/qca,ath79-cpu-intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/qca,ath79-misc-intc.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ath79-ddr-controller.txt + create mode 100644 Documentation/devicetree/bindings/mips/ath79-soc.txt + create mode 100644 Documentation/devicetree/bindings/phy/pistachio-usb-phy.txt + create mode 100644 Documentation/devicetree/bindings/serial/ingenic,uart.txt + create mode 100644 arch/mips/boot/dts/brcm/bcm7435.dtsi + create mode 100644 arch/mips/boot/dts/brcm/bcm97435svmb.dts + create mode 100644 arch/mips/boot/dts/ingenic/Makefile + create mode 100644 arch/mips/boot/dts/ingenic/ci20.dts + create mode 100644 arch/mips/boot/dts/ingenic/jz4740.dtsi + create mode 100644 arch/mips/boot/dts/ingenic/jz4780.dtsi + create mode 100644 arch/mips/boot/dts/ingenic/qi_lb60.dts + create mode 100644 arch/mips/boot/dts/mti/malta.dts + create mode 100644 arch/mips/boot/dts/qca/Makefile + create mode 100644 arch/mips/boot/dts/qca/ar9132.dtsi + create mode 100644 arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts + create mode 100644 arch/mips/configs/ci20_defconfig + create mode 100644 arch/mips/include/asm/bmips-spaces.h + delete mode 100644 arch/mips/include/asm/mach-loongson/workarounds.h + rename arch/mips/include/asm/{mach-loongson1 => mach-loongson32}/cpufreq.h (81%) + rename arch/mips/include/asm/{mach-loongson1 => mach-loongson32}/irq.h (95%) + rename arch/mips/include/asm/{mach-loongson1 => mach-loongson32}/loongson1.h (91%) + rename arch/mips/include/asm/{mach-loongson1 => mach-loongson32}/platform.h (85%) + rename arch/mips/include/asm/{mach-loongson1 => mach-loongson32}/prom.h (84%) + rename arch/mips/include/asm/{mach-loongson1 => mach-loongson32}/regs-clk.h (90%) + rename arch/mips/include/asm/{mach-loongson1 => mach-loongson32}/regs-mux.h (94%) + rename arch/mips/include/asm/{mach-loongson1 => mach-loongson32}/regs-pwm.h (84%) + rename arch/mips/include/asm/{mach-loongson1 => mach-loongson32}/regs-wdt.h (77%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/boot_param.h (98%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/cpu-feature-overrides.h (90%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/cs5536/cs5536.h (100%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/cs5536/cs5536_mfgpt.h (100%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/cs5536/cs5536_pci.h (100%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/cs5536/cs5536_vsm.h (100%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/dma-coherence.h (93%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/gpio.h (100%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/irq.h (92%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/kernel-entry-init.h (88%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/loongson.h (98%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/loongson_hwmon.h (100%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/machine.h (84%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/mc146818rtc.h (85%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/mem.h (89%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/mmzone.h (100%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/pci.h (93%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/spaces.h (65%) + rename arch/mips/include/asm/{mach-loongson => mach-loongson64}/topology.h (100%) + create mode 100644 arch/mips/include/asm/mach-loongson64/workarounds.h + delete mode 100644 arch/mips/jz4740/clock-debugfs.c + delete mode 100644 arch/mips/jz4740/clock.c + delete mode 100644 arch/mips/jz4740/clock.h + delete mode 100644 arch/mips/jz4740/irq.c + delete mode 100644 arch/mips/jz4740/serial.c + delete mode 100644 arch/mips/jz4740/serial.h + create mode 100644 arch/mips/kernel/sysrq.c + rename arch/mips/{loongson1 => loongson32}/Kconfig (95%) + rename arch/mips/{loongson1 => loongson32}/Makefile (74%) + rename arch/mips/{loongson1 => loongson32}/Platform (59%) + rename arch/mips/{loongson1 => loongson32}/common/Makefile (100%) + rename arch/mips/{loongson1 => loongson32}/common/irq.c (100%) + rename arch/mips/{loongson1 => loongson32}/common/platform.c (100%) + rename arch/mips/{loongson1 => loongson32}/common/prom.c (100%) + rename arch/mips/{loongson1 => loongson32}/common/reset.c (100%) + rename arch/mips/{loongson1 => loongson32}/common/setup.c (100%) + rename arch/mips/{loongson1 => loongson32}/common/time.c (100%) + rename arch/mips/{loongson1 => loongson32}/ls1b/Makefile (100%) + rename arch/mips/{loongson1 => loongson32}/ls1b/board.c (100%) + rename arch/mips/{loongson => loongson64}/Kconfig (97%) + rename arch/mips/{loongson => loongson64}/Makefile (88%) + rename arch/mips/{loongson => loongson64}/Platform (87%) + rename arch/mips/{loongson => loongson64}/common/Makefile (79%) + rename arch/mips/{loongson => loongson64}/common/bonito-irq.c (100%) + rename arch/mips/{loongson => loongson64}/common/cmdline.c (100%) + rename arch/mips/{loongson => loongson64}/common/cs5536/Makefile (100%) + rename arch/mips/{loongson => loongson64}/common/cs5536/cs5536_acc.c (100%) + rename arch/mips/{loongson => loongson64}/common/cs5536/cs5536_ehci.c (100%) + rename arch/mips/{loongson => loongson64}/common/cs5536/cs5536_ide.c (100%) + rename arch/mips/{loongson => loongson64}/common/cs5536/cs5536_isa.c (100%) + rename arch/mips/{loongson => loongson64}/common/cs5536/cs5536_mfgpt.c (100%) + rename arch/mips/{loongson => loongson64}/common/cs5536/cs5536_ohci.c (100%) + rename arch/mips/{loongson => loongson64}/common/cs5536/cs5536_pci.c (100%) + rename arch/mips/{loongson => loongson64}/common/dma-swiotlb.c (100%) + rename arch/mips/{loongson => loongson64}/common/early_printk.c (100%) + rename arch/mips/{loongson => loongson64}/common/env.c (100%) + rename arch/mips/{loongson => loongson64}/common/init.c (100%) + rename arch/mips/{loongson => loongson64}/common/irq.c (100%) + rename arch/mips/{loongson => loongson64}/common/machtype.c (100%) + rename arch/mips/{loongson => loongson64}/common/mem.c (100%) + rename arch/mips/{loongson => loongson64}/common/pci.c (100%) + rename arch/mips/{loongson => loongson64}/common/platform.c (100%) + rename arch/mips/{loongson => loongson64}/common/pm.c (100%) + rename arch/mips/{loongson => loongson64}/common/reset.c (100%) + rename arch/mips/{loongson => loongson64}/common/rtc.c (100%) + rename arch/mips/{loongson => loongson64}/common/serial.c (95%) + rename arch/mips/{loongson => loongson64}/common/setup.c (100%) + rename arch/mips/{loongson => loongson64}/common/time.c (100%) + rename arch/mips/{loongson => loongson64}/common/uart_base.c (100%) + rename arch/mips/{loongson => loongson64}/fuloong-2e/Makefile (100%) + rename arch/mips/{loongson => loongson64}/fuloong-2e/irq.c (100%) + rename arch/mips/{loongson => loongson64}/fuloong-2e/reset.c (100%) + rename arch/mips/{loongson => loongson64}/lemote-2f/Makefile (100%) + rename arch/mips/{loongson => loongson64}/lemote-2f/clock.c (100%) + rename arch/mips/{loongson => loongson64}/lemote-2f/ec_kb3310b.c (100%) + rename arch/mips/{loongson => loongson64}/lemote-2f/ec_kb3310b.h (100%) + rename arch/mips/{loongson => loongson64}/lemote-2f/irq.c (100%) + rename arch/mips/{loongson => loongson64}/lemote-2f/machtype.c (100%) + rename arch/mips/{loongson => loongson64}/lemote-2f/pm.c (100%) + rename arch/mips/{loongson => loongson64}/lemote-2f/reset.c (100%) + rename arch/mips/{loongson => loongson64}/loongson-3/Makefile (100%) + rename arch/mips/{loongson => loongson64}/loongson-3/cop2-ex.c (100%) + rename arch/mips/{loongson => loongson64}/loongson-3/hpet.c (100%) + rename arch/mips/{loongson => loongson64}/loongson-3/irq.c (100%) + rename arch/mips/{loongson => loongson64}/loongson-3/numa.c (100%) + rename arch/mips/{loongson => loongson64}/loongson-3/platform.c (100%) + rename arch/mips/{loongson => loongson64}/loongson-3/smp.c (100%) + rename arch/mips/{loongson => loongson64}/loongson-3/smp.h (100%) + create mode 100644 arch/mips/mti-malta/malta-dt.c + create mode 100644 arch/mips/net/bpf_jit_asm.S + create mode 100644 arch/mips/sgi-ip27/ip27-irqno.c + create mode 100644 drivers/clk/ingenic/Makefile + create mode 100644 drivers/clk/ingenic/cgu.c + create mode 100644 drivers/clk/ingenic/cgu.h + create mode 100644 drivers/clk/ingenic/jz4740-cgu.c + create mode 100644 drivers/clk/ingenic/jz4780-cgu.c + create mode 100644 drivers/irqchip/irq-ingenic.c + rename arch/mips/kernel/irq_cpu.c => drivers/irqchip/irq-mips-cpu.c (97%) + create mode 100644 drivers/phy/phy-pistachio-usb.c + create mode 100644 drivers/tty/serial/8250/8250_ingenic.c + create mode 100644 include/dt-bindings/clock/jz4740-cgu.h + create mode 100644 include/dt-bindings/clock/jz4780-cgu.h + create mode 100644 include/dt-bindings/phy/phy-pistachio-usb.h + rename arch/mips/jz4740/irq.h => include/linux/irqchip/ingenic.h (74%) + create mode 100644 include/linux/platform_data/gpio-ath79.h +Merging nios2/nios2-next (1a70db49a735 nios2: rework cache) +$ git merge nios2/nios2-next +Already up-to-date. +Merging parisc-hd/for-next (4b470f120817 Merge branch 'parisc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc-mpe/next (809fac67c853 selftests/powerpc: Add gitignore file for the new DSCR tests) +$ git merge powerpc-mpe/next +Auto-merging arch/powerpc/platforms/pasemi/msi.c +Removing arch/powerpc/configs/pseries_le_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-cxl | 33 ++ + Documentation/powerpc/00-INDEX | 2 + + Documentation/powerpc/cxl.txt | 4 + + Documentation/powerpc/dscr.txt | 83 ++++ + Documentation/vfio.txt | 12 + + MAINTAINERS | 9 +- + arch/powerpc/Kconfig.debug | 8 + + arch/powerpc/Makefile | 32 +- + arch/powerpc/configs/le.config | 1 + + arch/powerpc/configs/ppc64_defconfig | 1 + + arch/powerpc/configs/pseries_defconfig | 2 +- + arch/powerpc/configs/pseries_le_defconfig | 319 --------------- + arch/powerpc/include/asm/cputhreads.h | 13 +- + arch/powerpc/include/asm/device.h | 3 + + arch/powerpc/include/asm/eeh.h | 9 +- + arch/powerpc/include/asm/machdep.h | 6 - + arch/powerpc/include/asm/opal-api.h | 28 +- + arch/powerpc/include/asm/opal.h | 8 + + arch/powerpc/include/asm/page.h | 4 +- + arch/powerpc/include/asm/pci-bridge.h | 14 + + arch/powerpc/include/asm/pgtable-ppc64.h | 2 +- + arch/powerpc/include/asm/pnv-pci.h | 2 +- + arch/powerpc/include/asm/processor.h | 9 + + arch/powerpc/include/asm/systbl.h | 2 +- + arch/powerpc/include/uapi/asm/eeh.h | 56 +++ + arch/powerpc/include/uapi/asm/opal-prd.h | 58 +++ + arch/powerpc/kernel/Makefile | 3 +- + arch/powerpc/kernel/asm-offsets.c | 2 +- + arch/powerpc/kernel/dma.c | 8 + + arch/powerpc/kernel/eeh.c | 39 +- + arch/powerpc/kernel/eeh_cache.c | 16 +- + arch/powerpc/kernel/eeh_driver.c | 2 +- + arch/powerpc/kernel/entry_64.S | 2 +- + arch/powerpc/kernel/exceptions-64s.S | 16 +- + arch/powerpc/kernel/msi.c | 11 +- + arch/powerpc/kernel/pci-common.c | 11 + + arch/powerpc/kernel/pci-hotplug.c | 5 + + arch/powerpc/kernel/process.c | 1 - + arch/powerpc/kernel/setup_64.c | 3 +- + arch/powerpc/kernel/sysfs.c | 38 ++ + arch/powerpc/kernel/tm.S | 4 +- + arch/powerpc/kernel/traps.c | 45 ++- + arch/powerpc/kernel/vdso.c | 135 +++---- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 +- + arch/powerpc/mm/copro_fault.c | 9 +- + arch/powerpc/mm/hash_native_64.c | 2 +- + arch/powerpc/mm/hash_utils_64.c | 2 +- + arch/powerpc/perf/core-book3s.c | 11 +- + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +- + arch/powerpc/platforms/Kconfig.cputype | 11 + + arch/powerpc/platforms/cell/axon_msi.c | 7 +- + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 2 +- + arch/powerpc/platforms/pasemi/Makefile | 1 + + .../mpic_pasemi_msi.c => platforms/pasemi/msi.c} | 13 +- + arch/powerpc/platforms/powernv/Kconfig | 7 + + arch/powerpc/platforms/powernv/Makefile | 5 +- + arch/powerpc/platforms/powernv/eeh-powernv.c | 62 +-- + arch/powerpc/platforms/powernv/idle.c | 293 ++++++++++++++ + arch/powerpc/platforms/powernv/opal-async.c | 3 +- + arch/powerpc/platforms/powernv/opal-dump.c | 56 +-- + arch/powerpc/platforms/powernv/opal-elog.c | 32 +- + arch/powerpc/platforms/powernv/opal-hmi.c | 3 +- + arch/powerpc/platforms/powernv/opal-irqchip.c | 249 ++++++++++++ + .../powerpc/platforms/powernv/opal-memory-errors.c | 2 +- + arch/powerpc/platforms/powernv/opal-prd.c | 444 +++++++++++++++++++++ + arch/powerpc/platforms/powernv/opal-sensor.c | 3 +- + arch/powerpc/platforms/powernv/opal-sysparam.c | 43 +- + arch/powerpc/platforms/powernv/opal-wrappers.S | 2 + + arch/powerpc/platforms/powernv/opal.c | 224 +++-------- + arch/powerpc/platforms/powernv/pci-ioda.c | 33 +- + arch/powerpc/platforms/powernv/pci-p5ioc2.c | 10 +- + arch/powerpc/platforms/powernv/pci.c | 35 +- + arch/powerpc/platforms/powernv/pci.h | 7 +- + arch/powerpc/platforms/powernv/powernv.h | 11 +- + arch/powerpc/platforms/powernv/setup.c | 181 +-------- + arch/powerpc/platforms/pseries/dlpar.c | 3 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 2 +- + arch/powerpc/platforms/pseries/msi.c | 16 +- + arch/powerpc/sysdev/Makefile | 2 +- + arch/powerpc/sysdev/fsl_msi.c | 23 +- + arch/powerpc/sysdev/i8259.c | 2 +- + arch/powerpc/sysdev/ipic.c | 2 +- + arch/powerpc/sysdev/mpc8xx_pic.c | 2 +- + arch/powerpc/sysdev/mpic.c | 2 +- + arch/powerpc/sysdev/mpic.h | 10 +- + arch/powerpc/sysdev/mpic_u3msi.c | 9 +- + arch/powerpc/sysdev/mv64x60_pic.c | 2 +- + arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 7 +- + arch/powerpc/sysdev/ppc4xx_msi.c | 7 +- + arch/powerpc/sysdev/qe_lib/qe_ic.c | 2 +- + arch/powerpc/sysdev/tsi108_pci.c | 2 +- + arch/powerpc/sysdev/uic.c | 4 +- + arch/powerpc/sysdev/xics/xics-common.c | 4 +- + arch/powerpc/sysdev/xilinx_intc.c | 2 +- + drivers/char/ipmi/ipmi_powernv.c | 39 +- + drivers/misc/cxl/Makefile | 4 +- + drivers/misc/cxl/api.c | 331 +++++++++++++++ + drivers/misc/cxl/base.c | 2 +- + drivers/misc/cxl/context.c | 36 +- + drivers/misc/cxl/cxl.h | 38 +- + drivers/misc/cxl/fault.c | 34 +- + drivers/misc/cxl/file.c | 48 ++- + drivers/misc/cxl/irq.c | 37 +- + drivers/misc/cxl/main.c | 2 +- + drivers/misc/cxl/native.c | 83 ++-- + drivers/misc/cxl/pci.c | 127 ++++-- + drivers/misc/cxl/sysfs.c | 35 +- + drivers/misc/cxl/vphb.c | 270 +++++++++++++ + drivers/tty/hvc/hvc_opal.c | 33 +- + drivers/vfio/vfio_spapr_eeh.c | 10 + + include/misc/cxl-base.h | 48 +++ + include/misc/cxl.h | 207 ++++++++-- + include/uapi/linux/vfio.h | 14 +- + include/uapi/misc/cxl.h | 22 + + tools/testing/selftests/powerpc/Makefile | 2 +- + tools/testing/selftests/powerpc/dscr/.gitignore | 7 + + tools/testing/selftests/powerpc/dscr/Makefile | 14 + + tools/testing/selftests/powerpc/dscr/dscr.h | 127 ++++++ + .../selftests/powerpc/dscr/dscr_default_test.c | 127 ++++++ + .../selftests/powerpc/dscr/dscr_explicit_test.c | 71 ++++ + .../powerpc/dscr/dscr_inherit_exec_test.c | 117 ++++++ + .../selftests/powerpc/dscr/dscr_inherit_test.c | 95 +++++ + .../selftests/powerpc/dscr/dscr_sysfs_test.c | 97 +++++ + .../powerpc/dscr/dscr_sysfs_thread_test.c | 80 ++++ + .../selftests/powerpc/dscr/dscr_user_test.c | 61 +++ + .../selftests/powerpc/switch_endian/Makefile | 14 +- + tools/testing/selftests/powerpc/vphn/Makefile | 13 +- + 127 files changed, 3927 insertions(+), 1249 deletions(-) + create mode 100644 Documentation/powerpc/dscr.txt + create mode 100644 arch/powerpc/configs/le.config + delete mode 100644 arch/powerpc/configs/pseries_le_defconfig + create mode 100644 arch/powerpc/include/uapi/asm/eeh.h + create mode 100644 arch/powerpc/include/uapi/asm/opal-prd.h + rename arch/powerpc/{sysdev/mpic_pasemi_msi.c => platforms/pasemi/msi.c} (93%) + create mode 100644 arch/powerpc/platforms/powernv/idle.c + create mode 100644 arch/powerpc/platforms/powernv/opal-irqchip.c + create mode 100644 arch/powerpc/platforms/powernv/opal-prd.c + create mode 100644 drivers/misc/cxl/api.c + create mode 100644 drivers/misc/cxl/vphb.c + create mode 100644 include/misc/cxl-base.h + create mode 100644 tools/testing/selftests/powerpc/dscr/.gitignore + create mode 100644 tools/testing/selftests/powerpc/dscr/Makefile + create mode 100644 tools/testing/selftests/powerpc/dscr/dscr.h + create mode 100644 tools/testing/selftests/powerpc/dscr/dscr_default_test.c + create mode 100644 tools/testing/selftests/powerpc/dscr/dscr_explicit_test.c + create mode 100644 tools/testing/selftests/powerpc/dscr/dscr_inherit_exec_test.c + create mode 100644 tools/testing/selftests/powerpc/dscr/dscr_inherit_test.c + create mode 100644 tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c + create mode 100644 tools/testing/selftests/powerpc/dscr/dscr_sysfs_thread_test.c + create mode 100644 tools/testing/selftests/powerpc/dscr/dscr_user_test.c +Merging powerpc/next (65e7bb2a34fe Merge branch 'next-sriov' into next) +$ git merge powerpc/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging fsl/next (f1b3b4450dcb powerpc/85xx: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760) +$ git merge fsl/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/powerpc/fsl/fman.txt | 13 + + .../devicetree/bindings/powerpc/fsl/guts.txt | 5 + + .../devicetree/bindings/soc/fsl/qman-portals.txt | 4 +- + arch/powerpc/boot/dts/b4qds.dtsi | 12 + + arch/powerpc/boot/dts/fsl/b4420si-post.dtsi | 15 +- + arch/powerpc/boot/dts/fsl/b4860si-post.dtsi | 84 +++++- + arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 118 ++++++++ + arch/powerpc/boot/dts/fsl/p1023si-post.dtsi | 43 +++ + arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 13 + + arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 13 + + arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 13 + + arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 13 + + arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 13 + + arch/powerpc/boot/dts/fsl/qoriq-qman1-portals.dtsi | 20 +- + arch/powerpc/boot/dts/fsl/t1023si-post.dtsi | 330 +++++++++++++++++++++ + arch/powerpc/boot/dts/fsl/t1024si-post.dtsi | 100 +++++++ + arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi | 87 ++++++ + arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 78 +++++ + arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 130 +++++++- + arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 318 ++++++++++++++++++++ + arch/powerpc/boot/dts/kmcoge4.dts | 12 + + arch/powerpc/boot/dts/oca4080.dts | 12 + + arch/powerpc/boot/dts/p1023rdb.dts | 12 + + arch/powerpc/boot/dts/p2041rdb.dts | 12 + + arch/powerpc/boot/dts/p3041ds.dts | 12 + + arch/powerpc/boot/dts/p4080ds.dts | 12 + + arch/powerpc/boot/dts/p5020ds.dts | 12 + + arch/powerpc/boot/dts/p5040ds.dts | 12 + + arch/powerpc/boot/dts/t1023rdb.dts | 151 ++++++++++ + arch/powerpc/boot/dts/t1024qds.dts | 251 ++++++++++++++++ + arch/powerpc/boot/dts/t1024rdb.dts | 185 ++++++++++++ + arch/powerpc/boot/dts/t104xqds.dtsi | 12 + + arch/powerpc/boot/dts/t104xrdb.dtsi | 12 + + arch/powerpc/boot/dts/t208xqds.dtsi | 12 + + arch/powerpc/boot/dts/t208xrdb.dtsi | 12 + + arch/powerpc/boot/dts/t4240qds.dts | 12 + + arch/powerpc/boot/dts/t4240rdb.dts | 12 + + arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 2 +- + arch/powerpc/include/asm/cputable.h | 2 +- + arch/powerpc/include/asm/mmu-8xx.h | 33 +++ + arch/powerpc/include/asm/pgtable-ppc32.h | 19 -- + arch/powerpc/include/asm/pte-8xx.h | 31 +- + arch/powerpc/kernel/head_8xx.S | 110 ++++--- + arch/powerpc/kernel/idle_e500.S | 9 - + arch/powerpc/mm/mem.c | 2 +- + arch/powerpc/mm/tlb_low_64e.S | 51 +++- + arch/powerpc/platforms/85xx/Kconfig | 2 +- + arch/powerpc/platforms/85xx/corenet_generic.c | 3 + + arch/powerpc/platforms/85xx/smp.c | 51 +--- + arch/powerpc/platforms/85xx/twr_p102x.c | 4 +- + 50 files changed, 2313 insertions(+), 183 deletions(-) + create mode 100644 arch/powerpc/boot/dts/fsl/t1023si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/t1024si-post.dtsi + create mode 100644 arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi + create mode 100644 arch/powerpc/boot/dts/t1023rdb.dts + create mode 100644 arch/powerpc/boot/dts/t1024qds.dts + create mode 100644 arch/powerpc/boot/dts/t1024rdb.dts +Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (7c53fcb39fdd s390/dasd: Enable automatic loading of dasd_diag_mod) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/hypfs/hypfs_sprp.c | 4 +- + arch/s390/include/asm/sclp.h | 34 +++++++----- + arch/s390/kernel/crash_dump.c | 8 +-- + arch/s390/kernel/setup.c | 10 ++-- + arch/s390/kernel/smp.c | 13 ++--- + arch/s390/kvm/interrupt.c | 4 +- + arch/s390/kvm/kvm-s390.c | 8 +-- + arch/s390/mm/init.c | 2 +- + arch/s390/mm/mem_detect.c | 4 +- + drivers/s390/block/dasd.c | 17 ++++++ + drivers/s390/char/sclp.c | 2 +- + drivers/s390/char/sclp.h | 15 ++---- + drivers/s390/char/sclp_cmd.c | 27 ++++------ + drivers/s390/char/sclp_early.c | 118 ++++++++--------------------------------- + drivers/s390/char/zcore.c | 10 ++-- + drivers/s390/kvm/kvm_virtio.c | 4 +- + 16 files changed, 109 insertions(+), 171 deletions(-) +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 tile/master (5316a64ce518 tile: avoid a "label not used" warning in do_page_fault()) +$ git merge tile/master +Auto-merging arch/tile/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/tile/Kconfig | 7 +- + arch/tile/include/asm/irq.h | 5 ++ + arch/tile/include/asm/processor.h | 2 - + arch/tile/include/asm/spinlock_32.h | 6 +- + arch/tile/include/asm/spinlock_64.h | 5 +- + arch/tile/include/asm/stack.h | 13 ++-- + arch/tile/include/asm/thread_info.h | 1 + + arch/tile/include/asm/traps.h | 8 ++ + arch/tile/include/asm/uaccess.h | 66 +++------------- + arch/tile/include/asm/word-at-a-time.h | 36 +++++++++ + arch/tile/include/hv/hypervisor.h | 60 +++++++++++++- + arch/tile/kernel/entry.S | 7 -- + arch/tile/kernel/hvglue.S | 3 +- + arch/tile/kernel/hvglue_trace.c | 4 + + arch/tile/kernel/intvec_64.S | 6 ++ + arch/tile/kernel/process.c | 138 +++++++++++++++++++++++++++++---- + arch/tile/kernel/setup.c | 2 +- + arch/tile/kernel/stack.c | 125 +++++++++++++++++------------ + arch/tile/kernel/traps.c | 15 ++++ + arch/tile/kernel/vdso/vgettimeofday.c | 10 +-- + arch/tile/lib/exports.c | 3 - + arch/tile/lib/spinlock_32.c | 11 ++- + arch/tile/lib/spinlock_64.c | 11 ++- + arch/tile/lib/usercopy_32.S | 46 ----------- + arch/tile/lib/usercopy_64.S | 46 ----------- + arch/tile/mm/fault.c | 17 ++-- + drivers/tty/hvc/hvc_tile.c | 3 +- + 27 files changed, 402 insertions(+), 254 deletions(-) + create mode 100644 arch/tile/include/asm/word-at-a-time.h +Merging uml/linux-next (6c684465587a um: Fix warning in setup_signal_stack_si()) +$ git merge uml/linux-next +Removing fs/hppfs/hppfs.c +Removing fs/hppfs/Makefile +Merge made by the 'recursive' strategy. + arch/um/Kconfig.um | 15 - + arch/um/include/asm/Kbuild | 1 - + arch/um/include/asm/sections.h | 9 + + arch/um/include/asm/thread_info.h | 2 +- + arch/um/include/asm/uaccess.h | 176 ++------- + arch/um/include/shared/os.h | 2 + + arch/um/kernel/ksyms.c | 2 + + arch/um/kernel/physmem.c | 7 +- + arch/um/kernel/skas/mmu.c | 7 +- + arch/um/kernel/skas/uaccess.c | 47 +-- + arch/um/kernel/um_arch.c | 4 +- + arch/um/os-Linux/skas/mem.c | 6 +- + arch/um/os-Linux/skas/process.c | 8 +- + arch/x86/um/asm/checksum.h | 1 + + arch/x86/um/asm/elf.h | 2 - + arch/x86/um/asm/processor.h | 2 + + arch/x86/um/asm/segment.h | 8 + + arch/x86/um/ldt.c | 1 + + arch/x86/um/mem_32.c | 3 +- + arch/x86/um/mem_64.c | 3 +- + arch/x86/um/signal.c | 3 +- + arch/x86/um/syscalls_64.c | 1 + + arch/x86/um/vdso/vma.c | 1 + + fs/Makefile | 1 - + fs/hppfs/Makefile | 6 - + fs/hppfs/hppfs.c | 766 -------------------------------------- + 26 files changed, 88 insertions(+), 996 deletions(-) + create mode 100644 arch/um/include/asm/sections.h + delete mode 100644 fs/hppfs/Makefile + delete mode 100644 fs/hppfs/hppfs.c +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (ba155e2d21f6 Linux 4.1-rc5) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (e082f56313f3 btrfs: quota: Update quota tree after qgroup relationship change.) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (84b54fefaa05 libceph: announce support for straw2 buckets) +$ git merge ceph/master +Merge made by the 'recursive' strategy. +Merging cifs/for-next (843b06f1f0cb client MUST ignore EncryptionKeyLength if CAP_EXTENDED_SECURITY is set) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifssmb.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging ecryptfs/next (6d65261a09ad eCryptfs: don't pass fs-specific ioctl commands through) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (792352cb160e udf: fix udf_load_pvoldesc()) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + Documentation/filesystems/quota.txt | 5 +- + fs/ext3/super.c | 2 +- + fs/udf/dir.c | 2 +- + fs/udf/file.c | 2 - + fs/udf/namei.c | 95 ++++++++++++++++++++++++++++--------- + fs/udf/super.c | 26 ++++++---- + fs/udf/symlink.c | 3 ++ + fs/udf/unicode.c | 49 ++++++++++--------- + 8 files changed, 124 insertions(+), 60 deletions(-) +Merging ext4/dev (a65579bdbb65 ext4: Add support FALLOC_FL_INSERT_RANGE for fallocate) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/Kconfig | 1 + + fs/ext4/balloc.c | 4 +- + fs/ext4/crypto.c | 211 ++++++------------- + fs/ext4/crypto_fname.c | 490 +++++++++++--------------------------------- + fs/ext4/crypto_key.c | 152 +++++++++++--- + fs/ext4/crypto_policy.c | 87 ++++---- + fs/ext4/dir.c | 29 +-- + fs/ext4/ext4.h | 131 ++++++++---- + fs/ext4/ext4_crypto.h | 51 ++--- + fs/ext4/extents.c | 307 ++++++++++++++++++++++----- + fs/ext4/file.c | 19 +- + fs/ext4/ialloc.c | 45 ++-- + fs/ext4/inline.c | 31 ++- + fs/ext4/ioctl.c | 6 +- + fs/ext4/mballoc.c | 34 ++- + fs/ext4/namei.c | 415 +++++++++++++++---------------------- + fs/ext4/page-io.c | 2 +- + fs/ext4/readpage.c | 10 +- + fs/ext4/super.c | 13 +- + fs/ext4/symlink.c | 16 +- + fs/jbd2/journal.c | 13 +- + fs/jbd2/transaction.c | 270 ++++++++++++++---------- + include/trace/events/ext4.h | 25 +++ + 23 files changed, 1186 insertions(+), 1176 deletions(-) +Merging f2fs/dev (de6a8ec9822d f2fs: drop the volatile_write flag only) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/Kconfig | 19 ++ + fs/f2fs/Makefile | 2 + + fs/f2fs/acl.c | 46 ++-- + fs/f2fs/checkpoint.c | 56 ++--- + fs/f2fs/crypto.c | 484 ++++++++++++++++++++++++++++++++++++ + fs/f2fs/crypto_fname.c | 440 ++++++++++++++++++++++++++++++++ + fs/f2fs/crypto_key.c | 255 +++++++++++++++++++ + fs/f2fs/crypto_policy.c | 209 ++++++++++++++++ + fs/f2fs/data.c | 593 ++++++++++++++++++++++++++++++++------------ + fs/f2fs/debug.c | 11 +- + fs/f2fs/dir.c | 194 ++++++++++----- + fs/f2fs/f2fs.h | 320 ++++++++++++++++++++++-- + fs/f2fs/f2fs_crypto.h | 151 +++++++++++ + fs/f2fs/file.c | 508 ++++++++++++++++++++++++++++++++++--- + fs/f2fs/gc.c | 115 ++++++++- + fs/f2fs/hash.c | 3 +- + fs/f2fs/inline.c | 43 +++- + fs/f2fs/inode.c | 9 +- + fs/f2fs/namei.c | 374 ++++++++++++++++++++++------ + fs/f2fs/node.c | 48 ++-- + fs/f2fs/node.h | 22 -- + fs/f2fs/recovery.c | 28 ++- + fs/f2fs/segment.c | 250 +++++++++++++------ + fs/f2fs/segment.h | 1 + + fs/f2fs/super.c | 178 ++++++++++--- + fs/f2fs/trace.c | 6 +- + fs/f2fs/trace.h | 4 +- + fs/f2fs/xattr.c | 3 + + fs/f2fs/xattr.h | 4 + + include/linux/f2fs_fs.h | 8 + + include/trace/events/f2fs.h | 33 +-- + 31 files changed, 3792 insertions(+), 625 deletions(-) + create mode 100644 fs/f2fs/crypto.c + create mode 100644 fs/f2fs/crypto_fname.c + create mode 100644 fs/f2fs/crypto_key.c + create mode 100644 fs/f2fs/crypto_policy.c + create mode 100644 fs/f2fs/f2fs_crypto.h +Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) +$ git merge fscache/fscache +Auto-merging fs/cachefiles/namei.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/caching/backend-api.txt | 23 ++ + Documentation/filesystems/caching/fscache.txt | 7 +- + fs/cachefiles/internal.h | 1 - + fs/cachefiles/namei.c | 33 ++- + fs/fscache/cookie.c | 8 +- + fs/fscache/internal.h | 12 +- + fs/fscache/netfs.c | 38 ++-- + fs/fscache/object.c | 69 +++++- + fs/fscache/operation.c | 254 ++++++++++++++-------- + fs/fscache/page.c | 86 ++++---- + fs/fscache/stats.c | 14 +- + include/linux/fscache-cache.h | 55 +++-- + 12 files changed, 396 insertions(+), 204 deletions(-) +Merging fuse/for-next (780e2a3f06e7 fuse: update MAINTAINERS entry) +$ git merge fuse/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ioctl/ioctl-number.txt | 1 + + MAINTAINERS | 4 +- + fs/fuse/cuse.c | 15 +- + fs/fuse/dev.c | 825 ++++++++++++++++++----------------- + fs/fuse/file.c | 20 +- + fs/fuse/fuse_i.h | 167 ++++--- + fs/fuse/inode.c | 86 +++- + include/uapi/linux/fuse.h | 3 + + 8 files changed, 631 insertions(+), 490 deletions(-) +Merging gfs2/for-next (86066914edff gfs2: Don't support fallocate on jdata files) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/quota.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/gfs2/aops.c +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 12 ++- + fs/gfs2/file.c | 4 +- + fs/gfs2/incore.h | 1 + + fs/gfs2/inode.c | 211 +++++++++++++++++++++++++++++++++++++++++++++----- + fs/gfs2/ops_fstype.c | 1 + + fs/gfs2/quota.c | 212 +++++++++++++++++++++++++++++++-------------------- + fs/gfs2/rgrp.c | 25 +++--- + fs/gfs2/sys.c | 66 +++++++++++----- + 8 files changed, 397 insertions(+), 135 deletions(-) +Merging jfs/jfs-next (f7f31adf07d1 jfs: fix indentation on if statement) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/file.c | 2 +- + fs/jfs/inode.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging nfs/linux-next (0d2a970d0ae5 SUNRPC: Fix a backchannel race) +$ git merge nfs/linux-next +Removing net/sunrpc/bc_svc.c +Merge made by the 'recursive' strategy. + fs/nfs/inode.c | 2 + + fs/nfs/nfs3xdr.c | 2 +- + fs/nfs/nfs4idmap.c | 7 +-- + fs/nfs/nfs4state.c | 4 +- + include/linux/sunrpc/bc_xprt.h | 1 - + include/linux/sunrpc/sched.h | 3 +- + include/linux/sunrpc/xprt.h | 3 +- + net/sunrpc/Makefile | 2 +- + net/sunrpc/backchannel_rqst.c | 134 ++++++++++++++++++++++++----------------- + net/sunrpc/bc_svc.c | 63 ------------------- + net/sunrpc/clnt.c | 33 +++++----- + net/sunrpc/svc.c | 36 ++++++++--- + net/sunrpc/xprtsock.c | 8 --- + 13 files changed, 137 insertions(+), 161 deletions(-) + delete mode 100644 net/sunrpc/bc_svc.c +Merging nfsd/nfsd-next (185406191af5 nfsd: Allows user un-mounting filesystem where nfsd exports base on) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/svc.c +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/nfs/knfsd-stats.txt | 44 +------- + fs/fs_pin.c | 3 + + fs/namei.c | 100 ++++++++++++++++++ + fs/nfsd/export.c | 38 +++++-- + fs/nfsd/export.h | 10 +- + fs/nfsd/nfs3xdr.c | 14 +-- + fs/nfsd/nfs4acl.c | 12 --- + fs/nfsd/nfs4callback.c | 15 ++- + fs/nfsd/nfs4state.c | 5 +- + fs/nfsd/nfs4xdr.c | 33 +++--- + fs/nfsd/nfsproc.c | 52 +++++++++- + fs/nfsd/state.h | 1 + + fs/nfsd/vfs.c | 78 +++----------- + fs/nfsd/vfs.h | 1 - + include/linux/fs_pin.h | 6 ++ + include/linux/namei.h | 1 + + include/linux/path.h | 4 + + include/linux/sunrpc/cache.h | 11 ++ + include/linux/sunrpc/svc_rdma.h | 11 +- + include/uapi/linux/nfs4.h | 7 ++ + net/sunrpc/svc.c | 2 +- + net/sunrpc/xprtrdma/svc_rdma_marshal.c | 140 +++++++------------------- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 16 +-- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 36 ++----- + net/sunrpc/xprtrdma/xprt_rdma.h | 6 -- + 26 files changed, 341 insertions(+), 307 deletions(-) +Merging overlayfs/overlayfs-next (3ed6b3b4255d ovl: allow distributed fs as lower layer) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + fs/overlayfs/super.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 74 insertions(+), 7 deletions(-) +Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (3d99e3fe13d4 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (98fb1ffd8154 UBI: block: Add missing cache flushes) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (4ea79766168b Merge branch 'xfs-commit-cleanup' into for-next) +$ git merge xfs/for-next +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/file.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/xfs.txt | 12 +- + fs/dax.c | 34 ++- + fs/ext2/file.c | 4 +- + fs/ext4/file.c | 16 +- + fs/ext4/inode.c | 21 +- + fs/xfs/libxfs/xfs_alloc.c | 42 ++- + fs/xfs/libxfs/xfs_alloc.h | 2 + + fs/xfs/libxfs/xfs_attr.c | 25 +- + fs/xfs/libxfs/xfs_bmap.c | 26 +- + fs/xfs/libxfs/xfs_format.h | 52 +++- + fs/xfs/libxfs/xfs_fs.h | 1 + + fs/xfs/libxfs/xfs_ialloc.c | 542 ++++++++++++++++++++++++++++++++++---- + fs/xfs/libxfs/xfs_ialloc.h | 12 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 93 ++++++- + fs/xfs/libxfs/xfs_ialloc_btree.h | 10 + + fs/xfs/libxfs/xfs_sb.c | 34 ++- + fs/xfs/libxfs/xfs_shared.h | 6 - + fs/xfs/xfs_aops.c | 158 +++++++---- + fs/xfs/xfs_aops.h | 7 +- + fs/xfs/xfs_attr_inactive.c | 6 +- + fs/xfs/xfs_bmap_util.c | 89 +++---- + fs/xfs/xfs_dquot.c | 8 +- + fs/xfs/xfs_file.c | 166 +++++++----- + fs/xfs/xfs_fsops.c | 10 +- + fs/xfs/xfs_inode.c | 202 +++++--------- + fs/xfs/xfs_ioctl.c | 14 +- + fs/xfs/xfs_iomap.c | 18 +- + fs/xfs/xfs_iops.c | 48 ++-- + fs/xfs/xfs_itable.c | 13 +- + fs/xfs/xfs_log.c | 11 +- + fs/xfs/xfs_log.h | 13 +- + fs/xfs/xfs_log_cil.c | 12 +- + fs/xfs/xfs_log_recover.c | 34 ++- + fs/xfs/xfs_mount.c | 16 ++ + fs/xfs/xfs_mount.h | 4 + + fs/xfs/xfs_pnfs.c | 4 +- + fs/xfs/xfs_qm.c | 7 +- + fs/xfs/xfs_qm_syscalls.c | 20 +- + fs/xfs/xfs_quota.h | 1 - + fs/xfs/xfs_rtalloc.c | 16 +- + fs/xfs/xfs_super.c | 25 +- + fs/xfs/xfs_symlink.c | 17 +- + fs/xfs/xfs_trace.h | 47 ++++ + fs/xfs/xfs_trans.c | 91 +++---- + fs/xfs/xfs_trans.h | 7 +- + fs/xfs/xfs_trans_dquot.c | 32 ++- + fs/xfs/xfs_trans_priv.h | 2 +- + include/linux/fs.h | 9 +- + 48 files changed, 1392 insertions(+), 647 deletions(-) +Merging file-locks/linux-next (7505256626b0 Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (b853a16176cf turn user_{path_at,path,lpath,path_dir}() into static inlines) +$ git merge vfs/for-next +Resolved 'fs/ext4/symlink.c' using previous resolution. +Resolved 'fs/namei.c' using previous resolution. +Auto-merging include/linux/namei.h +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_iops.c +Removing fs/sysv/symlink.c +Auto-merging fs/namei.c +CONFLICT (content): Merge conflict in fs/namei.c +Auto-merging fs/jfs/inode.c +CONFLICT (modify/delete): fs/hppfs/hppfs.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of fs/hppfs/hppfs.c left in tree. +Auto-merging fs/hostfs/hostfs_kern.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/ext4/symlink.c +CONFLICT (content): Merge conflict in fs/ext4/symlink.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ext4.h +Removing fs/exofs/symlink.c +Auto-merging fs/cifs/link.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/hppfs/hppfs.c +fs/hppfs/hppfs.c: needs merge +rm 'fs/hppfs/hppfs.c' +$ git commit -v -a +[master b31cf6322053] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 4 +- + Documentation/filesystems/automount-support.txt | 51 +- + Documentation/filesystems/porting | 17 + + Documentation/filesystems/vfs.txt | 22 +- + .../lustre/lustre/include/linux/lustre_compat25.h | 15 - + .../staging/lustre/lustre/llite/llite_internal.h | 6 - + drivers/staging/lustre/lustre/llite/symlink.c | 26 +- + fs/9p/v9fs.h | 2 - + fs/9p/vfs_inode.c | 123 +- + fs/9p/vfs_inode_dotl.c | 39 +- + fs/autofs4/symlink.c | 5 +- + fs/befs/linuxvfs.c | 57 +- + fs/ceph/inode.c | 11 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/link.c | 28 +- + fs/configfs/symlink.c | 31 +- + fs/debugfs/file.c | 12 - + fs/debugfs/inode.c | 6 +- + fs/ecryptfs/inode.c | 11 +- + fs/exofs/Kbuild | 2 +- + fs/exofs/exofs.h | 4 - + fs/exofs/inode.c | 9 +- + fs/exofs/namei.c | 5 +- + fs/exofs/symlink.c | 55 - + fs/ext2/inode.c | 1 + + fs/ext2/namei.c | 3 +- + fs/ext2/symlink.c | 10 +- + fs/ext3/inode.c | 1 + + fs/ext3/namei.c | 3 +- + fs/ext3/symlink.c | 10 +- + fs/ext4/ext4.h | 1 + + fs/ext4/inode.c | 7 +- + fs/ext4/namei.c | 11 +- + fs/ext4/symlink.c | 46 +- + fs/f2fs/namei.c | 18 +- + fs/freevxfs/vxfs_extern.h | 3 - + fs/freevxfs/vxfs_immed.c | 34 - + fs/freevxfs/vxfs_inode.c | 7 +- + fs/fuse/dir.c | 22 +- + fs/gfs2/inode.c | 10 +- + fs/hostfs/hostfs_kern.c | 15 +- + fs/inode.c | 31 +- + fs/jffs2/dir.c | 1 + + fs/jffs2/fs.c | 1 + + fs/jffs2/symlink.c | 45 +- + fs/jfs/inode.c | 3 +- + fs/jfs/namei.c | 5 +- + fs/jfs/symlink.c | 10 +- + fs/kernfs/symlink.c | 25 +- + fs/libfs.c | 25 +- + fs/logfs/dir.c | 1 + + fs/mount.h | 1 + + fs/namei.c | 1453 ++++++++++---------- + fs/namespace.c | 27 +- + fs/nfs/symlink.c | 19 +- + fs/ntfs/namei.c | 2 +- + fs/open.c | 2 +- + fs/overlayfs/inode.c | 35 +- + fs/proc/base.c | 4 +- + fs/proc/inode.c | 9 +- + fs/proc/namespaces.c | 4 +- + fs/proc/self.c | 24 +- + fs/proc/thread_self.c | 22 +- + fs/sysv/Makefile | 2 +- + fs/sysv/inode.c | 5 +- + fs/sysv/symlink.c | 20 - + fs/sysv/sysv.h | 1 - + fs/ubifs/dir.c | 1 + + fs/ubifs/file.c | 11 +- + fs/ubifs/super.c | 1 + + fs/ufs/inode.c | 5 +- + fs/ufs/namei.c | 3 +- + fs/ufs/symlink.c | 13 +- + fs/xfs/xfs_iops.c | 11 +- + include/linux/debugfs.h | 1 - + include/linux/fs.h | 16 +- + include/linux/namei.h | 41 +- + include/linux/sched.h | 3 +- + include/linux/security.h | 13 +- + mm/shmem.c | 32 +- + security/capability.c | 4 +- + security/security.c | 7 +- + security/selinux/avc.c | 18 +- + security/selinux/hooks.c | 18 +- + security/selinux/include/avc.h | 9 +- + 85 files changed, 1215 insertions(+), 1514 deletions(-) + delete mode 100644 fs/exofs/symlink.c + delete mode 100644 fs/sysv/symlink.c +$ git am -3 ../patches/0001-f2fs-merge-fix-for-follow_link-changes.patch +Applying: f2fs: merge fix for follow_link changes +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/namei.c +$ git add -A . +$ git commit -v -a --amend +[master e0818a948e07] Merge remote-tracking branch 'vfs/for-next' + Date: Thu Jun 11 11:13:51 2015 +1000 +Merging pci/next (4d5da4d918f7 Merge branches 'pci/host-designware-common' and 'pci/host-xgene' into next) +$ git merge pci/next +Auto-merging drivers/virtio/virtio_pci_common.c +Removing drivers/pci/hotplug/pciehp_acpi.c +Auto-merging arch/powerpc/kernel/prom.c +Auto-merging arch/microblaze/include/asm/pci.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/DMA-API-HOWTO.txt | 29 +- + Documentation/DMA-API.txt | 30 +- + .../devicetree/bindings/pci/xgene-pci-msi.txt | 68 +++ + MAINTAINERS | 8 + + arch/alpha/include/asm/pci.h | 16 - + arch/alpha/kernel/core_irongate.c | 1 - + arch/alpha/kernel/sys_eiger.c | 1 - + arch/alpha/kernel/sys_nautilus.c | 1 - + arch/arm/include/asm/pci.h | 10 - + arch/arm64/boot/dts/apm/apm-storm.dtsi | 27 + + arch/frv/include/asm/pci.h | 10 - + arch/ia64/include/asm/pci.h | 32 -- + arch/microblaze/include/asm/pci.h | 23 - + arch/mips/include/asm/pci.h | 10 - + arch/mips/pci/fixup-cobalt.c | 1 - + arch/mips/pci/ops-mace.c | 1 - + arch/mips/pci/pci-lantiq.c | 1 - + arch/mn10300/include/asm/pci.h | 13 - + arch/parisc/include/asm/pci.h | 19 - + arch/powerpc/include/asm/pci.h | 30 -- + arch/powerpc/kernel/prom.c | 1 - + arch/powerpc/kernel/prom_init.c | 1 - + arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 +- + arch/s390/kernel/suspend.c | 2 +- + arch/sh/drivers/pci/ops-sh5.c | 1 - + arch/sh/drivers/pci/pci-sh5.c | 1 - + arch/sh/include/asm/pci.h | 18 - + arch/sparc/include/asm/pci_32.h | 10 - + arch/sparc/include/asm/pci_64.h | 19 - + arch/unicore32/include/asm/pci.h | 10 - + arch/x86/include/asm/pci.h | 7 - + arch/x86/kernel/x86_init.c | 1 - + drivers/acpi/pci_irq.c | 2 +- + drivers/net/ethernet/sun/cassini.c | 1 - + drivers/ntb/ntb_hw.c | 2 - + drivers/of/address.c | 2 +- + drivers/pci/Kconfig | 4 + + drivers/pci/bus.c | 10 +- + drivers/pci/host/Kconfig | 20 + + drivers/pci/host/Makefile | 2 + + drivers/pci/host/pci-dra7xx.c | 19 +- + drivers/pci/host/pci-exynos.c | 34 +- + drivers/pci/host/pci-imx6.c | 24 +- + drivers/pci/host/pci-keystone.c | 16 +- + drivers/pci/host/pci-layerscape.c | 25 +- + drivers/pci/host/pci-mvebu.c | 18 +- + drivers/pci/host/pci-tegra.c | 16 - + drivers/pci/host/pci-xgene-msi.c | 596 +++++++++++++++++++++ + drivers/pci/host/pci-xgene.c | 24 +- + drivers/pci/host/pcie-designware.c | 154 +++--- + drivers/pci/host/pcie-iproc-bcma.c | 110 ++++ + drivers/pci/host/pcie-iproc-platform.c | 12 +- + drivers/pci/host/pcie-iproc.c | 6 +- + drivers/pci/host/pcie-iproc.h | 4 +- + drivers/pci/host/pcie-spear13xx.c | 17 +- + drivers/pci/hotplug/Makefile | 3 - + drivers/pci/hotplug/acpiphp_glue.c | 5 +- + drivers/pci/hotplug/pciehp.h | 17 - + drivers/pci/hotplug/pciehp_acpi.c | 137 ----- + drivers/pci/hotplug/pciehp_core.c | 15 +- + drivers/pci/hotplug/pciehp_hpc.c | 52 +- + drivers/pci/msi.c | 53 +- + drivers/pci/pci.c | 44 +- + drivers/pci/pci.h | 32 +- + drivers/pci/pcie/aer/aerdrv_core.c | 3 +- + drivers/pci/pcie/aspm.c | 57 +- + drivers/pci/probe.c | 69 ++- + drivers/pci/quirks.c | 6 +- + drivers/pci/vc.c | 3 +- + drivers/pci/xen-pcifront.c | 16 +- + drivers/virtio/virtio_pci_common.c | 3 - + include/asm-generic/pci.h | 13 - + include/linux/pci.h | 44 +- + include/linux/types.h | 12 +- + 74 files changed, 1246 insertions(+), 860 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/xgene-pci-msi.txt + create mode 100644 drivers/pci/host/pci-xgene-msi.c + create mode 100644 drivers/pci/host/pcie-iproc-bcma.c + delete mode 100644 drivers/pci/hotplug/pciehp_acpi.c +Merging hid/for-next (4d4c484d0c59 Merge branch 'for-4.2/sony' into for-next) +$ git merge hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-hid-logitech-lg4ff | 8 +- + MAINTAINERS | 12 + + drivers/hid/Makefile | 6 +- + drivers/hid/hid-core.c | 33 +- + drivers/hid/hid-ids.h | 30 +- + drivers/hid/hid-input.c | 3 +- + drivers/hid/hid-lenovo.c | 59 ++- + drivers/hid/hid-lg.c | 24 +- + drivers/hid/hid-lg4ff.c | 458 ++++++++++++++------- + drivers/hid/hid-lg4ff.h | 4 +- + drivers/hid/hid-logitech-hidpp.c | 227 +++++++++- + drivers/hid/hid-prodikeys.c | 3 +- + drivers/hid/hid-rmi.c | 6 +- + drivers/hid/hid-sjoy.c | 3 + + drivers/hid/hid-sony.c | 215 ++++++++-- + drivers/hid/i2c-hid/i2c-hid.c | 7 +- + drivers/hid/usbhid/hid-quirks.c | 5 +- + drivers/hid/wacom.h | 2 +- + drivers/hid/wacom_sys.c | 152 ++++--- + drivers/hid/wacom_wac.c | 41 +- + drivers/hid/wacom_wac.h | 12 +- + drivers/usb/misc/ldusb.c | 10 - + include/linux/hid.h | 2 + + 23 files changed, 965 insertions(+), 357 deletions(-) +Merging i2c/i2c/for-next (c3413f46e575 Merge branch 'i2c/for-4.2' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i2c/i2c-at91.txt | 30 +- + .../devicetree/bindings/i2c/i2c-brcmstb.txt | 28 + + .../devicetree/bindings/i2c/i2c-mt6577.txt | 41 ++ + .../devicetree/bindings/i2c/i2c-xgene-slimpro.txt | 15 + + Documentation/i2c/slave-interface | 25 +- + drivers/i2c/algos/i2c-algo-pca.c | 2 +- + drivers/i2c/busses/Kconfig | 32 +- + drivers/i2c/busses/Makefile | 3 + + drivers/i2c/busses/i2c-at91.c | 356 ++++++++-- + drivers/i2c/busses/i2c-axxia.c | 41 ++ + drivers/i2c/busses/i2c-bcm-iproc.c | 57 ++ + drivers/i2c/busses/i2c-brcmstb.c | 694 +++++++++++++++++++ + drivers/i2c/busses/i2c-davinci.c | 53 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 32 +- + drivers/i2c/busses/i2c-imx.c | 2 +- + drivers/i2c/busses/i2c-mt65xx.c | 731 +++++++++++++++++++++ + drivers/i2c/busses/i2c-mxs.c | 2 +- + drivers/i2c/busses/i2c-omap.c | 74 ++- + drivers/i2c/busses/i2c-rcar.c | 5 +- + drivers/i2c/busses/i2c-rk3x.c | 2 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/busses/i2c-xgene-slimpro.c | 469 +++++++++++++ + drivers/i2c/busses/i2c-xiic.c | 1 + + drivers/i2c/i2c-core.c | 63 +- + drivers/i2c/i2c-smbus.c | 2 +- + drivers/i2c/muxes/Kconfig | 5 +- + include/uapi/linux/i2c.h | 1 + + 27 files changed, 2626 insertions(+), 142 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mt6577.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-xgene-slimpro.txt + create mode 100644 drivers/i2c/busses/i2c-brcmstb.c + create mode 100644 drivers/i2c/busses/i2c-mt65xx.c + create mode 100644 drivers/i2c/busses/i2c-xgene-slimpro.c +Merging jdelvare-hwmon/master (2b30464a2c87 hwmon: Document which I2C addresses can be probed) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. + Documentation/hwmon/submitting-patches | 7 +++++++ + Documentation/hwmon/w83792d | 18 +++++++++++++----- + drivers/hwmon/w83792d.c | 27 ++++++++++++++++++++++----- + 3 files changed, 42 insertions(+), 10 deletions(-) +Merging dmi/master (bec755ee1080 firmware: dmi: struct dmi_header should be packed) +$ git merge dmi/master +Auto-merging MAINTAINERS +Auto-merging Documentation/ABI/testing/sysfs-firmware-dmi-entries +Merge made by the 'recursive' strategy. + ...sfs-firmware-dmi => sysfs-firmware-dmi-entries} | 2 +- + .../ABI/testing/sysfs-firmware-dmi-tables | 22 ++++ + MAINTAINERS | 2 + + drivers/firmware/dmi-sysfs.c | 17 ++- + drivers/firmware/dmi_scan.c | 123 ++++++++++++++++++--- + include/linux/dmi.h | 4 +- + 6 files changed, 141 insertions(+), 29 deletions(-) + rename Documentation/ABI/testing/{sysfs-firmware-dmi => sysfs-firmware-dmi-entries} (99%) + create mode 100644 Documentation/ABI/testing/sysfs-firmware-dmi-tables +Merging hwmon-staging/hwmon-next (f6725ae2f1ae hwmon: (ntc_thermistor) Improve precision of resistance calculation) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/ntc_thermistor.txt | 1 + + Documentation/hwmon/ntc_thermistor | 6 +- + drivers/hwmon/Kconfig | 8 +-- + drivers/hwmon/atxp1.c | 58 +++------------ + drivers/hwmon/max197.c | 2 +- + drivers/hwmon/ntc_thermistor.c | 82 ++++++++++++++++------ + drivers/hwmon/sht15.c | 2 +- + include/linux/platform_data/ntc_thermistor.h | 1 + + 8 files changed, 82 insertions(+), 78 deletions(-) +Merging v4l-dvb/master (52d0f6e95987 Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Removing drivers/staging/media/dt3155v4l/dt3155v4l.c +Removing drivers/staging/media/dt3155v4l/Makefile +Removing drivers/staging/media/dt3155v4l/Kconfig +Auto-merging drivers/media/pci/dt3155/dt3155.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/DocBook/media/.gitignore | 1 + + Documentation/DocBook/media/Makefile | 88 +- + Documentation/DocBook/media/dvb/audio.xml | 6 +- + Documentation/DocBook/media/dvb/ca.xml | 4 +- + Documentation/DocBook/media/dvb/demux.xml | 61 +- + Documentation/DocBook/media/dvb/dvbapi.xml | 34 +- + Documentation/DocBook/media/dvb/dvbproperty.xml | 1117 ++++++++----- + Documentation/DocBook/media/dvb/examples.xml | 6 +- + .../media/dvb/fe-diseqc-recv-slave-reply.xml | 78 + + .../DocBook/media/dvb/fe-diseqc-reset-overload.xml | 51 + + .../DocBook/media/dvb/fe-diseqc-send-burst.xml | 89 + + .../media/dvb/fe-diseqc-send-master-cmd.xml | 72 + + .../media/dvb/fe-enable-high-lnb-voltage.xml | 61 + + Documentation/DocBook/media/dvb/fe-get-info.xml | 266 +++ + .../DocBook/media/dvb/fe-get-property.xml | 81 + + Documentation/DocBook/media/dvb/fe-read-status.xml | 107 ++ + .../media/dvb/fe-set-frontend-tune-mode.xml | 64 + + Documentation/DocBook/media/dvb/fe-set-tone.xml | 91 + + Documentation/DocBook/media/dvb/fe-set-voltage.xml | 69 + + Documentation/DocBook/media/dvb/frontend.xml | 1747 +++----------------- + .../DocBook/media/dvb/frontend_legacy_api.xml | 654 ++++++++ + Documentation/DocBook/media/dvb/intro.xml | 30 +- + Documentation/DocBook/media/dvb/kdapi.xml | 4 +- + Documentation/DocBook/media/dvb/net.xml | 374 +++-- + Documentation/DocBook/media/dvb/video.xml | 10 +- + .../DocBook/media/typical_media_device.svg | 28 + + Documentation/DocBook/media/v4l/controls.xml | 4 +- + Documentation/DocBook/media/v4l/io.xml | 26 +- + .../DocBook/media/v4l/media-func-open.xml | 2 +- + Documentation/DocBook/media/v4l/pixfmt-y16-be.xml | 81 + + Documentation/DocBook/media/v4l/pixfmt.xml | 134 +- + .../DocBook/media/v4l/remote_controllers.xml | 2 +- + Documentation/DocBook/media/v4l/subdev-formats.xml | 12 +- + .../DocBook/media/v4l/vidioc-create-bufs.xml | 3 +- + .../DocBook/media/v4l/vidioc-decoder-cmd.xml | 12 +- + Documentation/DocBook/media/v4l/vidioc-dqevent.xml | 5 +- + .../DocBook/media/v4l/vidioc-encoder-cmd.xml | 10 +- + .../media/v4l/vidioc-enum-frameintervals.xml | 3 +- + .../DocBook/media/v4l/vidioc-enum-framesizes.xml | 3 +- + Documentation/DocBook/media/v4l/vidioc-expbuf.xml | 3 +- + .../DocBook/media/v4l/vidioc-g-dv-timings.xml | 4 +- + Documentation/DocBook/media/v4l/vidioc-g-edid.xml | 11 +- + .../DocBook/media/v4l/vidioc-g-selection.xml | 2 +- + Documentation/DocBook/media/v4l/vidioc-qbuf.xml | 10 + + .../DocBook/media/v4l/vidioc-query-dv-timings.xml | 3 +- + .../DocBook/media/v4l/vidioc-querybuf.xml | 3 +- + Documentation/DocBook/media/v4l/vidioc-reqbufs.xml | 4 +- + .../DocBook/media/v4l/vidioc-subscribe-event.xml | 3 +- + Documentation/DocBook/media_api.tmpl | 53 +- + .../devicetree/bindings/media/i2c/adp1653.txt | 37 + + .../devicetree/bindings/media/st,stih4xx.txt | 32 + + Documentation/video4linux/CARDLIST.cx23885 | 9 +- + Documentation/video4linux/CARDLIST.em28xx | 2 + + Documentation/video4linux/CARDLIST.saa7134 | 1 + + Documentation/video4linux/CARDLIST.saa7164 | 3 + + Documentation/video4linux/v4l2-framework.txt | 4 + + Documentation/video4linux/v4l2-pci-skeleton.c | 2 - + Documentation/video4linux/vivid.txt | 32 +- + MAINTAINERS | 33 + + drivers/input/touchscreen/Kconfig | 3 +- + drivers/input/touchscreen/sur40.c | 46 +- + drivers/media/Kconfig | 2 +- + drivers/media/common/b2c2/Kconfig | 1 + + drivers/media/common/b2c2/flexcop-common.h | 1 + + drivers/media/common/b2c2/flexcop-fe-tuner.c | 63 +- + drivers/media/common/b2c2/flexcop-hw-filter.c | 16 +- + drivers/media/common/b2c2/flexcop-misc.c | 1 + + drivers/media/common/b2c2/flexcop-reg.h | 1 + + drivers/media/common/siano/smscoreapi.h | 3 +- + drivers/media/common/siano/smsdvb-main.c | 6 +- + drivers/media/common/siano/smsdvb.h | 2 +- + drivers/media/common/siano/smsir.c | 2 +- + drivers/media/dvb-core/dvb_frontend.c | 78 +- + drivers/media/dvb-core/dvb_frontend.h | 45 +- + drivers/media/dvb-frontends/Kconfig | 13 +- + drivers/media/dvb-frontends/Makefile | 1 + + drivers/media/dvb-frontends/a8293.c | 89 +- + drivers/media/dvb-frontends/a8293.h | 15 + + drivers/media/dvb-frontends/af9013.c | 8 +- + drivers/media/dvb-frontends/af9033.c | 4 +- + drivers/media/dvb-frontends/as102_fe.c | 4 +- + drivers/media/dvb-frontends/atbm8830.c | 3 +- + drivers/media/dvb-frontends/au8522_dig.c | 4 +- + drivers/media/dvb-frontends/au8522_priv.h | 2 +- + drivers/media/dvb-frontends/bcm3510.c | 6 +- + drivers/media/dvb-frontends/cx22700.c | 9 +- + drivers/media/dvb-frontends/cx22702.c | 2 +- + drivers/media/dvb-frontends/cx24110.c | 19 +- + drivers/media/dvb-frontends/cx24116.c | 46 +- + drivers/media/dvb-frontends/cx24117.c | 42 +- + drivers/media/dvb-frontends/cx24120.c | 1595 ++++++++++++++++++ + drivers/media/dvb-frontends/cx24120.h | 58 + + drivers/media/dvb-frontends/cx24123.c | 18 +- + drivers/media/dvb-frontends/cx24123.h | 2 +- + drivers/media/dvb-frontends/cxd2820r_c.c | 2 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 5 +- + drivers/media/dvb-frontends/cxd2820r_priv.h | 8 +- + drivers/media/dvb-frontends/cxd2820r_t.c | 2 +- + drivers/media/dvb-frontends/cxd2820r_t2.c | 2 +- + drivers/media/dvb-frontends/dib0070.c | 575 ++++--- + drivers/media/dvb-frontends/dib0090.c | 4 +- + drivers/media/dvb-frontends/dib3000mb.c | 7 +- + drivers/media/dvb-frontends/dib3000mc.c | 20 +- + drivers/media/dvb-frontends/dib7000m.c | 2 +- + drivers/media/dvb-frontends/dib7000p.c | 6 +- + drivers/media/dvb-frontends/dib8000.c | 10 +- + drivers/media/dvb-frontends/dib8000.h | 2 +- + drivers/media/dvb-frontends/dib9000.c | 4 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 42 +- + drivers/media/dvb-frontends/drxd_hard.c | 2 +- + drivers/media/dvb-frontends/drxk_hard.c | 11 +- + drivers/media/dvb-frontends/drxk_hard.h | 2 +- + drivers/media/dvb-frontends/ds3000.c | 13 +- + drivers/media/dvb-frontends/dvb_dummy_fe.c | 9 +- + drivers/media/dvb-frontends/ec100.c | 2 +- + drivers/media/dvb-frontends/hd29l2.c | 2 +- + drivers/media/dvb-frontends/hd29l2_priv.h | 2 +- + drivers/media/dvb-frontends/isl6405.c | 3 +- + drivers/media/dvb-frontends/isl6421.c | 6 +- + drivers/media/dvb-frontends/l64781.c | 2 +- + drivers/media/dvb-frontends/lg2160.c | 2 +- + drivers/media/dvb-frontends/lgdt3305.c | 4 +- + drivers/media/dvb-frontends/lgdt3306a.c | 11 +- + drivers/media/dvb-frontends/lgdt330x.c | 8 +- + drivers/media/dvb-frontends/lgs8gl5.c | 2 +- + drivers/media/dvb-frontends/lgs8gxx.c | 3 +- + drivers/media/dvb-frontends/lnbp21.c | 4 +- + drivers/media/dvb-frontends/lnbp22.c | 3 +- + drivers/media/dvb-frontends/m88ds3103.c | 1275 +++++++------- + drivers/media/dvb-frontends/m88ds3103.h | 67 +- + drivers/media/dvb-frontends/m88ds3103_priv.h | 20 +- + drivers/media/dvb-frontends/m88rs2000.c | 19 +- + drivers/media/dvb-frontends/mb86a16.c | 7 +- + drivers/media/dvb-frontends/mb86a16.h | 3 +- + drivers/media/dvb-frontends/mb86a20s.c | 6 +- + drivers/media/dvb-frontends/mb86a20s.h | 2 +- + drivers/media/dvb-frontends/mt312.c | 17 +- + drivers/media/dvb-frontends/mt352.c | 2 +- + drivers/media/dvb-frontends/nxt200x.c | 2 +- + drivers/media/dvb-frontends/nxt6000.c | 12 +- + drivers/media/dvb-frontends/or51132.c | 6 +- + drivers/media/dvb-frontends/or51211.c | 2 +- + drivers/media/dvb-frontends/rtl2830.c | 2 +- + drivers/media/dvb-frontends/rtl2830_priv.h | 2 +- + drivers/media/dvb-frontends/rtl2832.c | 10 +- + drivers/media/dvb-frontends/rtl2832.h | 2 + + drivers/media/dvb-frontends/rtl2832_priv.h | 51 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 120 +- + drivers/media/dvb-frontends/rtl2832_sdr.h | 1 + + drivers/media/dvb-frontends/s5h1409.c | 6 +- + drivers/media/dvb-frontends/s5h1411.c | 6 +- + drivers/media/dvb-frontends/s5h1420.c | 43 +- + drivers/media/dvb-frontends/s5h1432.c | 4 +- + drivers/media/dvb-frontends/s921.c | 6 +- + drivers/media/dvb-frontends/s921.h | 2 +- + drivers/media/dvb-frontends/si2165.c | 2 +- + drivers/media/dvb-frontends/si2168.c | 144 +- + drivers/media/dvb-frontends/si2168.h | 3 + + drivers/media/dvb-frontends/si2168_priv.h | 6 +- + drivers/media/dvb-frontends/si21xx.c | 10 +- + drivers/media/dvb-frontends/sp8870.c | 3 +- + drivers/media/dvb-frontends/sp887x.c | 2 +- + drivers/media/dvb-frontends/stb0899_drv.c | 8 +- + drivers/media/dvb-frontends/stv0288.c | 39 +- + drivers/media/dvb-frontends/stv0297.c | 19 +- + drivers/media/dvb-frontends/stv0299.c | 34 +- + drivers/media/dvb-frontends/stv0367.c | 12 +- + drivers/media/dvb-frontends/stv0367_priv.h | 2 +- + drivers/media/dvb-frontends/stv0900_core.c | 6 +- + drivers/media/dvb-frontends/stv0900_sw.c | 6 +- + drivers/media/dvb-frontends/stv090x.c | 5 +- + drivers/media/dvb-frontends/stv6110.c | 2 +- + drivers/media/dvb-frontends/tc90522.c | 17 +- + drivers/media/dvb-frontends/tda10021.c | 9 +- + drivers/media/dvb-frontends/tda10023.c | 5 +- + drivers/media/dvb-frontends/tda10048.c | 2 +- + drivers/media/dvb-frontends/tda1004x.c | 5 +- + drivers/media/dvb-frontends/tda10071.c | 117 +- + drivers/media/dvb-frontends/tda10071.h | 29 + + drivers/media/dvb-frontends/tda10071_priv.h | 11 +- + drivers/media/dvb-frontends/tda10086.c | 13 +- + drivers/media/dvb-frontends/tda8083.c | 38 +- + drivers/media/dvb-frontends/ts2020.c | 591 ++++--- + drivers/media/dvb-frontends/ts2020.h | 17 +- + drivers/media/dvb-frontends/ves1820.c | 6 +- + drivers/media/dvb-frontends/ves1x93.c | 15 +- + drivers/media/dvb-frontends/zl10353.c | 12 +- + drivers/media/firewire/firedtv-fe.c | 8 +- + drivers/media/firewire/firedtv.h | 4 +- + drivers/media/i2c/Kconfig | 4 +- + drivers/media/i2c/adp1653.c | 100 +- + drivers/media/i2c/adv7170.c | 42 +- + drivers/media/i2c/adv7175.c | 42 +- + drivers/media/i2c/adv7183.c | 61 +- + drivers/media/i2c/adv7511.c | 160 +- + drivers/media/i2c/adv7604.c | 192 ++- + drivers/media/i2c/adv7842.c | 309 +++- + drivers/media/i2c/ak881x.c | 39 +- + drivers/media/i2c/cx25840/cx25840-core.c | 17 +- + drivers/media/i2c/ml86v7667.c | 29 +- + drivers/media/i2c/mt9v011.c | 53 +- + drivers/media/i2c/ov2659.c | 38 +- + drivers/media/i2c/ov7670.c | 65 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +- + drivers/media/i2c/s5k5baf.c | 4 +- + drivers/media/i2c/s5k6aa.c | 2 +- + drivers/media/i2c/saa6752hs.c | 42 +- + drivers/media/i2c/saa7115.c | 16 +- + drivers/media/i2c/saa717x.c | 20 +- + drivers/media/i2c/smiapp/smiapp-core.c | 38 +- + drivers/media/i2c/soc_camera/imx074.c | 66 +- + drivers/media/i2c/soc_camera/mt9m001.c | 43 +- + drivers/media/i2c/soc_camera/mt9m111.c | 57 +- + drivers/media/i2c/soc_camera/mt9t031.c | 74 +- + drivers/media/i2c/soc_camera/mt9t112.c | 41 +- + drivers/media/i2c/soc_camera/mt9v022.c | 43 +- + drivers/media/i2c/soc_camera/ov2640.c | 62 +- + drivers/media/i2c/soc_camera/ov5642.c | 60 +- + drivers/media/i2c/soc_camera/ov6650.c | 43 +- + drivers/media/i2c/soc_camera/ov772x.c | 41 +- + drivers/media/i2c/soc_camera/ov9640.c | 32 +- + drivers/media/i2c/soc_camera/ov9740.c | 35 +- + drivers/media/i2c/soc_camera/rj54n1cb0c.c | 66 +- + drivers/media/i2c/soc_camera/tw9910.c | 41 +- + drivers/media/i2c/sr030pc30.c | 62 +- + drivers/media/i2c/tvaudio.c | 2 +- + drivers/media/i2c/tvp514x.c | 55 +- + drivers/media/i2c/tvp5150.c | 30 +- + drivers/media/i2c/tvp7002.c | 48 - + drivers/media/i2c/vs6624.c | 55 +- + drivers/media/pci/Kconfig | 2 + + drivers/media/pci/Makefile | 2 + + drivers/media/pci/bt8xx/bttv-audio-hook.c | 443 +++-- + drivers/media/pci/bt8xx/bttv-driver.c | 5 +- + drivers/media/pci/bt8xx/dst.c | 25 +- + drivers/media/pci/bt8xx/dst_ca.c | 138 +- + drivers/media/pci/bt8xx/dst_common.h | 12 +- + drivers/media/pci/cobalt/Kconfig | 18 + + drivers/media/pci/cobalt/Makefile | 5 + + drivers/media/pci/cobalt/cobalt-alsa-main.c | 162 ++ + drivers/media/pci/cobalt/cobalt-alsa-pcm.c | 603 +++++++ + drivers/media/pci/cobalt/cobalt-alsa-pcm.h | 22 + + drivers/media/pci/cobalt/cobalt-alsa.h | 41 + + drivers/media/pci/cobalt/cobalt-cpld.c | 341 ++++ + drivers/media/pci/cobalt/cobalt-cpld.h | 29 + + drivers/media/pci/cobalt/cobalt-driver.c | 832 ++++++++++ + drivers/media/pci/cobalt/cobalt-driver.h | 380 +++++ + drivers/media/pci/cobalt/cobalt-flash.c | 128 ++ + drivers/media/pci/cobalt/cobalt-flash.h | 29 + + drivers/media/pci/cobalt/cobalt-i2c.c | 396 +++++ + drivers/media/pci/cobalt/cobalt-i2c.h | 25 + + drivers/media/pci/cobalt/cobalt-irq.c | 258 +++ + drivers/media/pci/cobalt/cobalt-irq.h | 25 + + drivers/media/pci/cobalt/cobalt-omnitek.c | 341 ++++ + drivers/media/pci/cobalt/cobalt-omnitek.h | 62 + + drivers/media/pci/cobalt/cobalt-v4l2.c | 1272 ++++++++++++++ + drivers/media/pci/cobalt/cobalt-v4l2.h | 22 + + .../cobalt/m00233_video_measure_memmap_package.h | 115 ++ + .../pci/cobalt/m00235_fdma_packer_memmap_package.h | 44 + + .../media/pci/cobalt/m00389_cvi_memmap_package.h | 59 + + .../media/pci/cobalt/m00460_evcnt_memmap_package.h | 44 + + .../pci/cobalt/m00473_freewheel_memmap_package.h | 57 + + .../m00479_clk_loss_detector_memmap_package.h | 53 + + .../m00514_syncgen_flow_evcnt_memmap_package.h | 88 + + drivers/media/pci/cx18/cx18-av-core.c | 16 +- + drivers/media/pci/cx18/cx18-controls.c | 13 +- + drivers/media/pci/cx18/cx18-driver.c | 4 +- + drivers/media/pci/cx18/cx18-ioctl.c | 12 +- + drivers/media/pci/cx18/cx18-streams.c | 1 + + drivers/media/pci/cx23885/altera-ci.c | 2 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 150 +- + drivers/media/pci/cx23885/cx23885-f300.c | 2 +- + drivers/media/pci/cx23885/cx23885-f300.h | 2 +- + drivers/media/pci/cx23885/cx23885-video.c | 12 +- + drivers/media/pci/cx23885/cx23885.h | 3 +- + drivers/media/pci/cx25821/cx25821-medusa-reg.h | 6 +- + drivers/media/pci/cx88/cx88-core.c | 2 + + drivers/media/pci/cx88/cx88-dvb.c | 12 +- + drivers/media/pci/cx88/cx88-mpeg.c | 6 +- + drivers/media/pci/cx88/cx88-vbi.c | 6 +- + drivers/media/pci/cx88/cx88-video.c | 7 +- + drivers/media/pci/cx88/cx88.h | 6 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 3 +- + drivers/media/pci/dm1105/dm1105.c | 3 +- + drivers/media/pci/dt3155/Kconfig | 13 + + drivers/media/pci/dt3155/Makefile | 1 + + drivers/media/pci/dt3155/dt3155.c | 632 +++++++ + .../dt3155v4l.h => media/pci/dt3155/dt3155.h} | 64 +- + drivers/media/pci/ivtv/ivtv-controls.c | 12 +- + drivers/media/pci/ivtv/ivtv-driver.c | 4 +- + drivers/media/pci/ivtv/ivtv-driver.h | 3 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 15 +- + drivers/media/pci/mantis/hopper_cards.c | 14 +- + drivers/media/pci/mantis/mantis_cards.c | 94 +- + drivers/media/pci/mantis/mantis_common.h | 33 +- + drivers/media/pci/mantis/mantis_dma.c | 5 +- + drivers/media/pci/mantis/mantis_i2c.c | 8 +- + drivers/media/pci/mantis/mantis_input.c | 110 +- + drivers/media/pci/mantis/mantis_input.h | 24 + + drivers/media/pci/mantis/mantis_pcmcia.c | 4 +- + drivers/media/pci/mantis/mantis_uart.c | 61 +- + drivers/media/pci/mantis/mantis_vp1034.c | 2 +- + drivers/media/pci/mantis/mantis_vp1034.h | 3 +- + drivers/media/pci/ngene/ngene-core.c | 10 +- + drivers/media/pci/ngene/ngene.h | 2 +- + drivers/media/pci/pt1/pt1.c | 6 +- + drivers/media/pci/pt1/va1j5jf8007s.c | 4 +- + drivers/media/pci/pt1/va1j5jf8007t.c | 4 +- + drivers/media/pci/pt3/pt3.c | 2 +- + drivers/media/pci/saa7134/saa7134-alsa.c | 55 +- + drivers/media/pci/saa7134/saa7134-cards.c | 150 +- + drivers/media/pci/saa7134/saa7134-core.c | 161 +- + drivers/media/pci/saa7134/saa7134-dvb.c | 122 +- + drivers/media/pci/saa7134/saa7134-empress.c | 55 +- + drivers/media/pci/saa7134/saa7134-go7007.c | 5 +- + drivers/media/pci/saa7134/saa7134-i2c.c | 87 +- + drivers/media/pci/saa7134/saa7134-input.c | 59 +- + drivers/media/pci/saa7134/saa7134-ts.c | 24 +- + drivers/media/pci/saa7134/saa7134-tvaudio.c | 168 +- + drivers/media/pci/saa7134/saa7134-vbi.c | 14 +- + drivers/media/pci/saa7134/saa7134-video.c | 43 +- + drivers/media/pci/saa7134/saa7134.h | 6 +- + drivers/media/pci/saa7164/saa7164-api.c | 11 +- + drivers/media/pci/saa7164/saa7164-buffer.c | 2 +- + drivers/media/pci/saa7164/saa7164-bus.c | 2 +- + drivers/media/pci/saa7164/saa7164-cards.c | 188 ++- + drivers/media/pci/saa7164/saa7164-cmd.c | 2 +- + drivers/media/pci/saa7164/saa7164-core.c | 82 +- + drivers/media/pci/saa7164/saa7164-dvb.c | 241 ++- + drivers/media/pci/saa7164/saa7164-encoder.c | 13 +- + drivers/media/pci/saa7164/saa7164-fw.c | 2 +- + drivers/media/pci/saa7164/saa7164-i2c.c | 9 +- + drivers/media/pci/saa7164/saa7164-reg.h | 2 +- + drivers/media/pci/saa7164/saa7164-types.h | 2 +- + drivers/media/pci/saa7164/saa7164-vbi.c | 13 +- + drivers/media/pci/saa7164/saa7164.h | 8 +- + drivers/media/pci/smipcie/smipcie.c | 1 + + drivers/media/pci/sta2x11/sta2x11_vip.c | 3 +- + drivers/media/pci/ttpci/av7110.c | 18 +- + drivers/media/pci/ttpci/av7110.h | 27 +- + drivers/media/pci/ttpci/budget-core.c | 3 +- + drivers/media/pci/ttpci/budget-patch.c | 15 +- + drivers/media/pci/ttpci/budget.c | 12 +- + drivers/media/pci/ttpci/budget.h | 2 +- + drivers/media/pci/zoran/zoran_device.c | 13 +- + drivers/media/platform/Kconfig | 10 + + drivers/media/platform/Makefile | 2 + + drivers/media/platform/am437x/am437x-vpfe.c | 35 +- + drivers/media/platform/blackfin/bfin_capture.c | 40 +- + drivers/media/platform/coda/coda-bit.c | 4 +- + drivers/media/platform/coda/coda-common.c | 27 +- + drivers/media/platform/coda/coda.h | 3 + + drivers/media/platform/coda/trace.h | 2 - + drivers/media/platform/davinci/vpbe_display.c | 9 +- + drivers/media/platform/davinci/vpfe_capture.c | 19 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 2 +- + drivers/media/platform/exynos4-is/Kconfig | 1 + + drivers/media/platform/exynos4-is/media-dev.c | 2 +- + drivers/media/platform/fsl-viu.c | 2 +- + drivers/media/platform/m2m-deinterlace.c | 1 - + drivers/media/platform/marvell-ccic/cafe-driver.c | 13 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 480 ++---- + drivers/media/platform/marvell-ccic/mcam-core.h | 3 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 1 + + drivers/media/platform/omap/omap_vout.c | 10 +- + drivers/media/platform/s3c-camif/camif-capture.c | 13 +- + drivers/media/platform/s3c-camif/camif-core.c | 2 +- + drivers/media/platform/s5p-g2d/g2d.c | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 5 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 6 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 4 +- + drivers/media/platform/s5p-tv/hdmi_drv.c | 14 +- + drivers/media/platform/s5p-tv/mixer_drv.c | 15 +- + drivers/media/platform/s5p-tv/sdo_drv.c | 14 +- + drivers/media/platform/sh_vou.c | 75 +- + drivers/media/platform/soc_camera/atmel-isi.c | 74 +- + drivers/media/platform/soc_camera/mx2_camera.c | 113 +- + drivers/media/platform/soc_camera/mx3_camera.c | 105 +- + drivers/media/platform/soc_camera/omap1_camera.c | 106 +- + drivers/media/platform/soc_camera/pxa_camera.c | 99 +- + drivers/media/platform/soc_camera/rcar_vin.c | 113 +- + .../platform/soc_camera/sh_mobile_ceu_camera.c | 115 +- + drivers/media/platform/soc_camera/sh_mobile_csi2.c | 35 +- + drivers/media/platform/soc_camera/soc_camera.c | 30 +- + .../platform/soc_camera/soc_camera_platform.c | 24 +- + drivers/media/platform/soc_camera/soc_scale_crop.c | 37 +- + drivers/media/platform/sti/bdisp/Kconfig | 9 + + drivers/media/platform/sti/bdisp/Makefile | 3 + + drivers/media/platform/sti/bdisp/bdisp-debug.c | 668 ++++++++ + drivers/media/platform/sti/bdisp/bdisp-filter.h | 346 ++++ + drivers/media/platform/sti/bdisp/bdisp-hw.c | 823 +++++++++ + drivers/media/platform/sti/bdisp/bdisp-reg.h | 235 +++ + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 1416 ++++++++++++++++ + drivers/media/platform/sti/bdisp/bdisp.h | 216 +++ + drivers/media/platform/via-camera.c | 19 +- + drivers/media/platform/vim2m.c | 12 +- + drivers/media/platform/vivid/vivid-core.c | 20 +- + drivers/media/platform/vivid/vivid-core.h | 6 +- + drivers/media/platform/vivid/vivid-ctrls.c | 139 +- + drivers/media/platform/vivid/vivid-radio-rx.c | 2 + + drivers/media/platform/vivid/vivid-sdr-cap.c | 96 +- + drivers/media/platform/vivid/vivid-sdr-cap.h | 2 + + drivers/media/platform/vivid/vivid-tpg-colors.c | 478 ++++-- + drivers/media/platform/vivid/vivid-tpg-colors.h | 4 +- + drivers/media/platform/vivid/vivid-tpg.c | 313 ++-- + drivers/media/platform/vivid/vivid-tpg.h | 20 + + drivers/media/platform/vivid/vivid-vid-cap.c | 31 +- + drivers/media/platform/vivid/vivid-vid-common.c | 68 +- + drivers/media/platform/vivid/vivid-vid-out.c | 7 +- + drivers/media/platform/xilinx/Kconfig | 2 +- + drivers/media/platform/xilinx/xilinx-dma.c | 4 +- + drivers/media/radio/radio-si476x.c | 4 +- + drivers/media/radio/radio-timb.c | 4 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 3 +- + drivers/media/radio/si4713/si4713.c | 4 +- + drivers/media/radio/wl128x/Kconfig | 4 +- + drivers/media/radio/wl128x/fmdrv.h | 2 +- + drivers/media/rc/fintek-cir.c | 1 - + drivers/media/rc/gpio-ir-recv.c | 4 +- + drivers/media/rc/ir-hix5hd2.c | 8 +- + drivers/media/rc/ir-rc5-decoder.c | 116 ++ + drivers/media/rc/ir-rc6-decoder.c | 122 ++ + drivers/media/rc/ir-sony-decoder.c | 28 +- + drivers/media/rc/keymaps/Makefile | 4 + + drivers/media/rc/keymaps/rc-technisat-ts35.c | 76 + + .../media/rc/keymaps/rc-terratec-cinergy-c-pci.c | 88 + + .../media/rc/keymaps/rc-terratec-cinergy-s2-hd.c | 86 + + drivers/media/rc/keymaps/rc-twinhan-dtv-cab-ci.c | 98 ++ + drivers/media/rc/nuvoton-cir.c | 127 ++ + drivers/media/rc/nuvoton-cir.h | 1 + + drivers/media/rc/rc-core-priv.h | 36 + + drivers/media/rc/rc-ir-raw.c | 139 ++ + drivers/media/rc/rc-loopback.c | 36 + + drivers/media/rc/rc-main.c | 9 +- + drivers/media/rc/redrat3.c | 7 +- + drivers/media/rc/st_rc.c | 10 +- + drivers/media/rc/streamzap.c | 6 +- + drivers/media/tuners/Kconfig | 5 +- + drivers/media/tuners/e4000.c | 592 ++++--- + drivers/media/tuners/e4000.h | 1 - + drivers/media/tuners/e4000_priv.h | 11 +- + drivers/media/tuners/fc0013.c | 2 - + drivers/media/tuners/fc2580.c | 781 +++++---- + drivers/media/tuners/fc2580.h | 40 +- + drivers/media/tuners/fc2580_priv.h | 36 +- + drivers/media/tuners/msi001.c | 267 +-- + drivers/media/tuners/qt1010.c | 8 +- + drivers/media/tuners/r820t.c | 4 +- + drivers/media/tuners/si2157.c | 44 +- + drivers/media/tuners/si2157.h | 6 + + drivers/media/tuners/si2157_priv.h | 2 + + drivers/media/tuners/tua9001.c | 331 ++-- + drivers/media/tuners/tua9001.h | 35 +- + drivers/media/tuners/tua9001_priv.h | 19 +- + drivers/media/tuners/tuner-xc2028.c | 2 +- + drivers/media/usb/as102/as102_drv.c | 1 + + drivers/media/usb/au0828/au0828-cards.c | 2 - + drivers/media/usb/au0828/au0828-core.c | 2 + + drivers/media/usb/cx231xx/cx231xx-417.c | 21 +- + drivers/media/usb/cx231xx/cx231xx-avcore.c | 44 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 56 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 30 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 2 + + drivers/media/usb/cx231xx/cx231xx-vbi.c | 3 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 26 +- + drivers/media/usb/cx231xx/cx231xx.h | 1 + + drivers/media/usb/dvb-usb-v2/af9015.c | 2 +- + drivers/media/usb/dvb-usb-v2/af9015.h | 2 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 58 +- + drivers/media/usb/dvb-usb-v2/dvbsky.c | 18 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 115 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c | 14 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 193 ++- + drivers/media/usb/dvb-usb-v2/rtl28xxu.h | 5 + + drivers/media/usb/dvb-usb/af9005-fe.c | 7 +- + drivers/media/usb/dvb-usb/az6027.c | 3 +- + drivers/media/usb/dvb-usb/cinergyT2-fe.c | 2 +- + drivers/media/usb/dvb-usb/cxusb.c | 1 + + drivers/media/usb/dvb-usb/dib0700.h | 2 +- + drivers/media/usb/dvb-usb/dib0700_core.c | 70 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 145 +- + drivers/media/usb/dvb-usb/dtt200u-fe.c | 7 +- + drivers/media/usb/dvb-usb/dw2102.c | 55 +- + drivers/media/usb/dvb-usb/friio-fe.c | 3 +- + drivers/media/usb/dvb-usb/gp8psk-fe.c | 13 +- + drivers/media/usb/dvb-usb/opera1.c | 3 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +- + drivers/media/usb/dvb-usb/vp702x-fe.c | 17 +- + drivers/media/usb/dvb-usb/vp702x.c | 7 +- + drivers/media/usb/dvb-usb/vp7045-fe.c | 3 +- + drivers/media/usb/em28xx/em28xx-camera.c | 12 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 216 ++- + drivers/media/usb/em28xx/em28xx-video.c | 1 - + drivers/media/usb/go7007/go7007-driver.c | 3 +- + drivers/media/usb/go7007/go7007-usb.c | 4 + + drivers/media/usb/go7007/go7007-v4l2.c | 12 +- + drivers/media/usb/go7007/s2250-board.c | 18 +- + drivers/media/usb/gspca/benq.c | 4 +- + drivers/media/usb/gspca/sn9c2028.c | 241 ++- + drivers/media/usb/gspca/sn9c2028.h | 18 +- + drivers/media/usb/gspca/sonixj.c | 2 +- + drivers/media/usb/gspca/stk014.c | 2 +- + drivers/media/usb/gspca/xirlink_cit.c | 12 +- + drivers/media/usb/gspca/zc3xx.c | 16 +- + drivers/media/usb/msi2500/msi2500.c | 655 ++++---- + drivers/media/usb/pvrusb2/pvrusb2-context.c | 3 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 35 +- + drivers/media/usb/pvrusb2/pvrusb2-io.c | 30 +- + drivers/media/usb/pvrusb2/pvrusb2-ioread.c | 24 +- + drivers/media/usb/stk1160/stk1160-v4l.c | 3 +- + drivers/media/usb/tm6000/tm6000-video.c | 5 +- + drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 9 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 4 +- + drivers/media/usb/ttusb-dec/ttusbdecfe.c | 10 +- + drivers/media/usb/usbtv/usbtv-video.c | 12 +- + drivers/media/usb/usbvision/usbvision-core.c | 4 +- + drivers/media/usb/usbvision/usbvision-video.c | 17 +- + drivers/media/usb/uvc/uvc_driver.c | 2 - + drivers/media/usb/uvc/uvc_queue.c | 12 + + drivers/media/usb/uvc/uvc_v4l2.c | 16 +- + drivers/media/usb/uvc/uvc_video.c | 8 + + drivers/media/usb/uvc/uvcvideo.h | 7 +- + drivers/media/usb/zr364xx/zr364xx.c | 3 +- + drivers/media/v4l2-core/Kconfig | 2 +- + drivers/media/v4l2-core/v4l2-dv-timings.c | 117 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 214 ++- + drivers/media/v4l2-core/v4l2-mem2mem.c | 38 +- + drivers/media/v4l2-core/v4l2-of.c | 100 +- + drivers/media/v4l2-core/videobuf2-core.c | 32 +- + drivers/media/v4l2-core/videobuf2-dma-contig.c | 13 +- + drivers/media/v4l2-core/videobuf2-dma-sg.c | 28 +- + drivers/media/v4l2-core/videobuf2-vmalloc.c | 12 +- + drivers/staging/media/Kconfig | 2 - + drivers/staging/media/Makefile | 1 - + drivers/staging/media/bcm2048/radio-bcm2048.c | 3 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 1 + + .../staging/media/davinci_vpfe/vpfe_mc_capture.h | 2 - + drivers/staging/media/davinci_vpfe/vpfe_video.c | 18 +- + drivers/staging/media/dt3155v4l/Kconfig | 29 - + drivers/staging/media/dt3155v4l/Makefile | 1 - + drivers/staging/media/dt3155v4l/dt3155v4l.c | 981 ----------- + drivers/staging/media/lirc/lirc_imon.c | 97 +- + drivers/staging/media/lirc/lirc_sir.c | 75 +- + drivers/staging/media/mn88472/mn88472.c | 6 +- + drivers/staging/media/mn88472/mn88472_priv.h | 2 +- + drivers/staging/media/mn88473/mn88473.c | 2 +- + drivers/staging/media/mn88473/mn88473_priv.h | 2 +- + drivers/staging/media/omap4iss/iss.c | 2 +- + drivers/staging/media/omap4iss/iss_csi2.c | 18 +- + drivers/staging/media/omap4iss/iss_ipipe.c | 30 +- + drivers/staging/media/omap4iss/iss_ipipeif.c | 10 +- + drivers/staging/media/omap4iss/iss_resizer.c | 8 +- + include/media/adp1653.h | 8 +- + include/media/adv7511.h | 7 +- + include/media/adv7604.h | 1 - + include/media/adv7842.h | 142 +- + include/media/rc-core.h | 9 +- + include/media/rc-map.h | 4 + + include/media/v4l2-dv-timings.h | 6 +- + include/media/v4l2-mediabus.h | 2 + + include/media/v4l2-mem2mem.h | 4 + + include/media/v4l2-of.h | 20 +- + include/media/v4l2-subdev.h | 18 +- + include/media/videobuf2-core.h | 13 + + include/trace/events/v4l2.h | 3 +- + include/uapi/linux/dvb/dmx.h | 10 +- + include/uapi/linux/dvb/frontend.h | 223 +-- + include/uapi/linux/v4l2-mediabus.h | 4 +- + include/uapi/linux/videodev2.h | 83 +- + 569 files changed, 27300 insertions(+), 10230 deletions(-) + create mode 100644 Documentation/DocBook/media/.gitignore + create mode 100644 Documentation/DocBook/media/dvb/fe-diseqc-recv-slave-reply.xml + create mode 100644 Documentation/DocBook/media/dvb/fe-diseqc-reset-overload.xml + create mode 100644 Documentation/DocBook/media/dvb/fe-diseqc-send-burst.xml + create mode 100644 Documentation/DocBook/media/dvb/fe-diseqc-send-master-cmd.xml + create mode 100644 Documentation/DocBook/media/dvb/fe-enable-high-lnb-voltage.xml + create mode 100644 Documentation/DocBook/media/dvb/fe-get-info.xml + create mode 100644 Documentation/DocBook/media/dvb/fe-get-property.xml + create mode 100644 Documentation/DocBook/media/dvb/fe-read-status.xml + create mode 100644 Documentation/DocBook/media/dvb/fe-set-frontend-tune-mode.xml + create mode 100644 Documentation/DocBook/media/dvb/fe-set-tone.xml + create mode 100644 Documentation/DocBook/media/dvb/fe-set-voltage.xml + create mode 100644 Documentation/DocBook/media/dvb/frontend_legacy_api.xml + create mode 100644 Documentation/DocBook/media/typical_media_device.svg + create mode 100644 Documentation/DocBook/media/v4l/pixfmt-y16-be.xml + create mode 100644 Documentation/devicetree/bindings/media/i2c/adp1653.txt + create mode 100644 Documentation/devicetree/bindings/media/st,stih4xx.txt + create mode 100644 drivers/media/dvb-frontends/cx24120.c + create mode 100644 drivers/media/dvb-frontends/cx24120.h + create mode 100644 drivers/media/pci/cobalt/Kconfig + create mode 100644 drivers/media/pci/cobalt/Makefile + create mode 100644 drivers/media/pci/cobalt/cobalt-alsa-main.c + create mode 100644 drivers/media/pci/cobalt/cobalt-alsa-pcm.c + create mode 100644 drivers/media/pci/cobalt/cobalt-alsa-pcm.h + create mode 100644 drivers/media/pci/cobalt/cobalt-alsa.h + create mode 100644 drivers/media/pci/cobalt/cobalt-cpld.c + create mode 100644 drivers/media/pci/cobalt/cobalt-cpld.h + create mode 100644 drivers/media/pci/cobalt/cobalt-driver.c + create mode 100644 drivers/media/pci/cobalt/cobalt-driver.h + create mode 100644 drivers/media/pci/cobalt/cobalt-flash.c + create mode 100644 drivers/media/pci/cobalt/cobalt-flash.h + create mode 100644 drivers/media/pci/cobalt/cobalt-i2c.c + create mode 100644 drivers/media/pci/cobalt/cobalt-i2c.h + create mode 100644 drivers/media/pci/cobalt/cobalt-irq.c + create mode 100644 drivers/media/pci/cobalt/cobalt-irq.h + create mode 100644 drivers/media/pci/cobalt/cobalt-omnitek.c + create mode 100644 drivers/media/pci/cobalt/cobalt-omnitek.h + create mode 100644 drivers/media/pci/cobalt/cobalt-v4l2.c + create mode 100644 drivers/media/pci/cobalt/cobalt-v4l2.h + create mode 100644 drivers/media/pci/cobalt/m00233_video_measure_memmap_package.h + create mode 100644 drivers/media/pci/cobalt/m00235_fdma_packer_memmap_package.h + create mode 100644 drivers/media/pci/cobalt/m00389_cvi_memmap_package.h + create mode 100644 drivers/media/pci/cobalt/m00460_evcnt_memmap_package.h + create mode 100644 drivers/media/pci/cobalt/m00473_freewheel_memmap_package.h + create mode 100644 drivers/media/pci/cobalt/m00479_clk_loss_detector_memmap_package.h + create mode 100644 drivers/media/pci/cobalt/m00514_syncgen_flow_evcnt_memmap_package.h + create mode 100644 drivers/media/pci/dt3155/Kconfig + create mode 100644 drivers/media/pci/dt3155/Makefile + create mode 100644 drivers/media/pci/dt3155/dt3155.c + rename drivers/{staging/media/dt3155v4l/dt3155v4l.h => media/pci/dt3155/dt3155.h} (82%) + create mode 100644 drivers/media/pci/mantis/mantis_input.h + create mode 100644 drivers/media/platform/sti/bdisp/Kconfig + create mode 100644 drivers/media/platform/sti/bdisp/Makefile + create mode 100644 drivers/media/platform/sti/bdisp/bdisp-debug.c + create mode 100644 drivers/media/platform/sti/bdisp/bdisp-filter.h + create mode 100644 drivers/media/platform/sti/bdisp/bdisp-hw.c + create mode 100644 drivers/media/platform/sti/bdisp/bdisp-reg.h + create mode 100644 drivers/media/platform/sti/bdisp/bdisp-v4l2.c + create mode 100644 drivers/media/platform/sti/bdisp/bdisp.h + create mode 100644 drivers/media/rc/keymaps/rc-technisat-ts35.c + create mode 100644 drivers/media/rc/keymaps/rc-terratec-cinergy-c-pci.c + create mode 100644 drivers/media/rc/keymaps/rc-terratec-cinergy-s2-hd.c + create mode 100644 drivers/media/rc/keymaps/rc-twinhan-dtv-cab-ci.c + delete mode 100644 drivers/staging/media/dt3155v4l/Kconfig + delete mode 100644 drivers/staging/media/dt3155v4l/Makefile + delete mode 100644 drivers/staging/media/dt3155v4l/dt3155v4l.c +Merging kbuild/for-next (f412fabbc164 Merge branch 'kbuild/kconfig' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/lto-build | 173 ++++++++++++++++++++++++++++ + Makefile | 35 ++++-- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 ++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.lto | 84 ++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/coccinelle/api/pm_runtime.cocci | 2 +- + scripts/coccinelle/api/simple_open.cocci | 4 +- + scripts/coccinelle/api/vma_pages.cocci | 60 ++++++++++ + scripts/coccinelle/misc/ifaddr.cocci | 3 +- + scripts/coccinelle/misc/irqf_oneshot.cocci | 7 +- + scripts/coccinelle/misc/returnvar.cocci | 2 +- + scripts/coccinelle/misc/semicolon.cocci | 2 +- + scripts/coccinelle/misc/simple_return.cocci | 2 +- + scripts/kconfig/Makefile | 28 ++--- + scripts/kconfig/expr.c | 111 ------------------ + scripts/link-vmlinux.sh | 20 +++- + scripts/package/builddeb | 31 +++-- + scripts/package/mkspec | 4 +- + 21 files changed, 490 insertions(+), 164 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto + create mode 100644 scripts/coccinelle/api/vma_pages.cocci +Merging kconfig/for-next (bfa76d495765 Linux 3.19) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (72edb9faf1d5 Merge branch 'for-4.2' into for-next) +$ git merge libata/for-next +Auto-merging drivers/ata/Kconfig +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-ata | 11 + + .../devicetree/bindings/ata/ahci-ceva.txt | 20 ++ + .../devicetree/bindings/ata/ahci-platform.txt | 2 + + .../devicetree/bindings/ata/brcm,sata-brcmstb.txt | 34 +++ + Documentation/kernel-parameters.txt | 2 + + drivers/ata/Kconfig | 18 ++ + drivers/ata/Makefile | 2 + + drivers/ata/acard-ahci.c | 4 +- + drivers/ata/ahci.c | 46 ++- + drivers/ata/ahci.h | 6 +- + drivers/ata/ahci_brcmstb.c | 322 +++++++++++++++++++++ + drivers/ata/ahci_ceva.c | 238 +++++++++++++++ + drivers/ata/ahci_platform.c | 1 + + drivers/ata/ahci_xgene.c | 103 +++++-- + drivers/ata/libahci.c | 105 +++++-- + drivers/ata/libahci_platform.c | 4 +- + drivers/ata/libata-core.c | 11 +- + drivers/ata/libata-eh.c | 13 +- + drivers/ata/libata-transport.c | 22 ++ + drivers/ata/pata_hpt366.c | 4 +- + drivers/ata/pata_samsung_cf.c | 2 +- + drivers/ata/sata_highbank.c | 3 +- + drivers/ata/sata_nv.c | 2 +- + include/linux/ata.h | 12 +- + include/linux/libata.h | 1 + + 25 files changed, 908 insertions(+), 80 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/ahci-ceva.txt + create mode 100644 Documentation/devicetree/bindings/ata/brcm,sata-brcmstb.txt + create mode 100644 drivers/ata/ahci_brcmstb.c + create mode 100644 drivers/ata/ahci_ceva.c +Merging pm/linux-next (45423299db3a Merge branches 'pnp' and 'pm-tools') +$ git merge pm/linux-next +Auto-merging drivers/cpufreq/Kconfig.arm +Auto-merging drivers/acpi/pci_irq.c +Auto-merging arch/arm/mach-omap2/omap_device.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/cpu-freq/user-guide.txt | 2 - + Documentation/kernel-parameters.txt | 62 ++--- + Documentation/power/runtime_pm.txt | 6 + + arch/arm/mach-davinci/pm_domain.c | 32 +-- + arch/arm/mach-keystone/pm_domain.c | 33 +-- + arch/arm/mach-omap1/pm_bus.c | 37 +-- + arch/arm/mach-omap2/omap_device.c | 7 +- + drivers/acpi/Kconfig | 2 +- + drivers/acpi/acpi_processor.c | 20 +- + drivers/acpi/acpica/acdebug.h | 4 +- + drivers/acpi/acpica/aclocal.h | 15 + + drivers/acpi/acpica/acparser.h | 3 + + drivers/acpi/acpica/acpredef.h | 45 ++- + drivers/acpi/acpica/acutils.h | 2 +- + drivers/acpi/acpica/dsmethod.c | 5 +- + drivers/acpi/acpica/hwpci.c | 9 +- + drivers/acpi/acpica/nsprepkg.c | 13 + + drivers/acpi/acpica/nsrepair.c | 2 +- + drivers/acpi/acpica/psopinfo.c | 3 - + drivers/acpi/acpica/utfileio.c | 9 +- + drivers/acpi/acpica/uthex.c | 4 +- + drivers/acpi/acpica/utxferror.c | 11 +- + drivers/acpi/apei/ghes.c | 108 ++++---- + drivers/acpi/battery.c | 18 +- + drivers/acpi/device_pm.c | 97 ++++--- + drivers/acpi/ec.c | 148 +++++----- + drivers/acpi/fan.c | 5 +- + drivers/acpi/internal.h | 3 + + drivers/acpi/osl.c | 2 +- + drivers/acpi/pci_irq.c | 1 - + drivers/acpi/power.c | 45 ++- + drivers/acpi/processor_core.c | 10 +- + drivers/acpi/processor_pdc.c | 5 +- + drivers/acpi/property.c | 54 ++-- + drivers/acpi/scan.c | 54 ++-- + drivers/base/power/Makefile | 2 +- + drivers/base/power/clock_ops.c | 40 ++- + drivers/base/power/main.c | 3 + + drivers/base/power/power.h | 48 ++++ + drivers/base/power/runtime.c | 6 + + drivers/base/power/wakeirq.c | 273 ++++++++++++++++++ + drivers/base/power/wakeup.c | 146 ++++++++++ + drivers/bus/omap_l3_noc.c | 4 +- + drivers/cpufreq/Kconfig.arm | 2 +- + drivers/cpufreq/arm_big_little.c | 40 ++- + drivers/cpufreq/cpufreq.c | 305 ++++++++++++--------- + drivers/cpufreq/intel_pstate.c | 33 ++- + drivers/cpufreq/pxa2xx-cpufreq.c | 20 +- + drivers/cpuidle/cpuidle.c | 40 ++- + drivers/cpuidle/governors/menu.c | 4 +- + drivers/leds/led-class.c | 7 +- + drivers/pci/pci-acpi.c | 2 +- + drivers/pnp/pnpacpi/rsparser.c | 10 +- + drivers/powercap/intel_rapl.c | 51 +++- + drivers/sh/pm_runtime.c | 47 +--- + drivers/xen/xen-acpi-cpuhotplug.c | 12 +- + include/acpi/acpi_bus.h | 6 +- + include/acpi/acpiosxf.h | 2 +- + include/acpi/acpixf.h | 2 +- + include/acpi/actbl.h | 17 +- + include/acpi/actbl1.h | 176 +++++++++++- + include/acpi/actbl2.h | 146 ++++++++-- + include/acpi/actbl3.h | 88 +++++- + include/acpi/actypes.h | 6 +- + include/acpi/acuuid.h | 89 ++++++ + include/acpi/platform/acenv.h | 3 + + include/acpi/platform/acenvex.h | 3 + + include/linux/acpi.h | 10 + + include/linux/cpufreq.h | 5 +- + include/linux/cpuidle.h | 20 +- + include/linux/pm.h | 14 + + include/linux/pm_clock.h | 10 + + include/linux/pm_wakeirq.h | 51 ++++ + include/linux/pm_wakeup.h | 9 + + include/linux/tick.h | 12 +- + include/trace/events/power.h | 25 +- + kernel/power/main.c | 2 +- + kernel/power/suspend.c | 8 +- + kernel/sched/idle.c | 114 ++++---- + kernel/time/tick-common.c | 17 +- + .../cpupower/utils/idle_monitor/mperf_monitor.c | 5 +- + 81 files changed, 2001 insertions(+), 810 deletions(-) + create mode 100644 drivers/base/power/wakeirq.c + create mode 100644 include/acpi/acuuid.h + create mode 100644 include/linux/pm_wakeirq.h +Merging idle/next (a576d08d4eb2 Merge branches 'cpuidle' and 'turbostat' into release) +$ git merge idle/next +Merge made by the 'recursive' strategy. + drivers/idle/intel_idle.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging thermal/next (e27f74ae45b3 Merge branches 'for-rc' and 'release' of .git into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/Kconfig | 24 +- + drivers/thermal/Makefile | 2 + + .../int340x_thermal/processor_thermal_device.c | 59 ++- + drivers/thermal/intel_powerclamp.c | 1 + + drivers/thermal/intel_quark_dts_thermal.c | 473 ++++++++++++++++++++ + drivers/thermal/intel_soc_dts_iosf.c | 478 +++++++++++++++++++++ + drivers/thermal/intel_soc_dts_iosf.h | 62 +++ + drivers/thermal/intel_soc_dts_thermal.c | 430 +----------------- + 8 files changed, 1118 insertions(+), 411 deletions(-) + create mode 100644 drivers/thermal/intel_quark_dts_thermal.c + create mode 100644 drivers/thermal/intel_soc_dts_iosf.c + create mode 100644 drivers/thermal/intel_soc_dts_iosf.h +Merging thermal-soc/next (b89384e9e8c0 Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Auto-merging drivers/thermal/thermal_core.h +Auto-merging drivers/thermal/Makefile +Auto-merging drivers/thermal/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/thermal/hisilicon-thermal.txt | 23 + + .../bindings/thermal/qcom-spmi-temp-alarm.txt | 57 ++ + .../devicetree/bindings/thermal/thermal.txt | 9 + + Documentation/thermal/cpu-cooling-api.txt | 156 +++++- + Documentation/thermal/power_allocator.txt | 247 +++++++++ + Documentation/thermal/sysfs-api.txt | 99 +++- + drivers/acpi/thermal.c | 9 +- + drivers/platform/x86/acerhdf.c | 3 +- + drivers/thermal/Kconfig | 44 ++ + drivers/thermal/Makefile | 3 + + drivers/thermal/cpu_cooling.c | 585 ++++++++++++++++++++- + drivers/thermal/db8500_thermal.c | 2 +- + drivers/thermal/fair_share.c | 41 +- + drivers/thermal/hisi_thermal.c | 421 +++++++++++++++ + drivers/thermal/imx_thermal.c | 3 +- + drivers/thermal/of-thermal.c | 41 +- + drivers/thermal/power_allocator.c | 539 +++++++++++++++++++ + drivers/thermal/qcom-spmi-temp-alarm.c | 309 +++++++++++ + drivers/thermal/samsung/exynos_tmu.c | 187 ++++++- + drivers/thermal/samsung/exynos_tmu.h | 1 + + drivers/thermal/thermal_core.c | 314 ++++++++++- + drivers/thermal/thermal_core.h | 11 + + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 104 ++-- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 +- + drivers/thermal/x86_pkg_temp_thermal.c | 2 +- + include/linux/cpu_cooling.h | 39 ++ + include/linux/thermal.h | 97 +++- + include/trace/events/thermal.h | 58 ++ + include/trace/events/thermal_power_allocator.h | 87 +++ + 29 files changed, 3359 insertions(+), 137 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/hisilicon-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt + create mode 100644 Documentation/thermal/power_allocator.txt + create mode 100644 drivers/thermal/hisi_thermal.c + create mode 100644 drivers/thermal/power_allocator.c + create mode 100644 drivers/thermal/qcom-spmi-temp-alarm.c + create mode 100644 include/trace/events/thermal_power_allocator.h +Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (023600f192be swiotlb: do not export map_single function) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (040e7ee5ce25 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Removing include/linux/platform_data/dma-rcar-audmapp.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/dma.txt | 28 + + Documentation/devicetree/bindings/dma/mv-xor.txt | 2 +- + .../devicetree/bindings/dma/sirfsoc-dma.txt | 3 +- + .../devicetree/bindings/dma/sun6i-dma.txt | 5 +- + .../devicetree/bindings/dma/ti-dma-crossbar.txt | 52 + + Documentation/dmaengine/pxa_dma.txt | 153 ++ + MAINTAINERS | 1 + + drivers/dma/Kconfig | 15 + + drivers/dma/Makefile | 2 + + drivers/dma/amba-pl08x.c | 2 +- + drivers/dma/at_xdmac.c | 343 ++++- + drivers/dma/dmaengine.c | 11 +- + drivers/dma/ep93xx_dma.c | 2 +- + drivers/dma/imx-dma.c | 2 +- + drivers/dma/imx-sdma.c | 2 +- + drivers/dma/mv_xor.c | 352 ++--- + drivers/dma/mv_xor.h | 27 +- + drivers/dma/mxs-dma.c | 2 +- + drivers/dma/nbpfaxi.c | 2 +- + drivers/dma/of-dma.c | 89 ++ + drivers/dma/omap-dma.c | 80 +- + drivers/dma/pl330.c | 8 +- + drivers/dma/pxa_dma.c | 1467 ++++++++++++++++++++ + drivers/dma/s3c24xx-dma.c | 2 +- + drivers/dma/sh/rcar-dmac.c | 2 +- + drivers/dma/sh/shdma-r8a73a4.c | 2 +- + drivers/dma/sirf-dma.c | 423 ++++-- + drivers/dma/sun6i-dma.c | 12 + + drivers/dma/ti-dma-crossbar.c | 188 +++ + drivers/dma/xgene-dma.c | 173 +-- + include/linux/dma/pxa-dma.h | 27 + + include/linux/dmaengine.h | 25 + + include/linux/of_dma.h | 21 + + include/linux/platform_data/dma-rcar-audmapp.h | 34 - + 34 files changed, 3078 insertions(+), 481 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt + create mode 100644 Documentation/dmaengine/pxa_dma.txt + create mode 100644 drivers/dma/pxa_dma.c + create mode 100644 drivers/dma/ti-dma-crossbar.c + create mode 100644 include/linux/dma/pxa-dma.h + delete mode 100644 include/linux/platform_data/dma-rcar-audmapp.h +Merging net-next/master (c3eee1fb1d30 Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge) +$ git merge net-next/master +Removing samples/pktgen/pktgen.conf-2-2 +Removing samples/pktgen/pktgen.conf-2-1 +Removing samples/pktgen/pktgen.conf-1-1 +Auto-merging net/ipv4/geneve_core.c +Removing include/net/flow_keys.h +Removing drivers/net/phy/amd-xgbe-phy.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/net/amd-xgbe-phy.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-pci-drivers-janz-cmodio | 8 + + Documentation/ABI/testing/sysfs-class-net | 19 + + .../ABI/testing/sysfs-class-net-janz-ican3 | 19 + + .../devicetree/bindings/net/amd-xgbe-phy.txt | 48 - + Documentation/devicetree/bindings/net/amd-xgbe.txt | 40 +- + .../devicetree/bindings/net/ipq806x-dwmac.txt | 35 + + Documentation/devicetree/bindings/net/macb.txt | 1 + + .../devicetree/bindings/net/nxp,lpc1850-dwmac.txt | 20 + + Documentation/devicetree/bindings/net/phy.txt | 3 + + .../devicetree/bindings/net/ti,dp83867.txt | 25 + + Documentation/networking/bonding.txt | 84 + + Documentation/networking/can.txt | 3 + + Documentation/networking/dctcp.txt | 1 + + Documentation/networking/ieee802154.txt | 32 +- + Documentation/networking/ip-sysctl.txt | 25 +- + Documentation/networking/pktgen.txt | 150 +- + Documentation/networking/switchdev.txt | 426 +- + Documentation/networking/tc-actions-env-rules.txt | 6 - + Documentation/s390/qeth.txt | 4 +- + MAINTAINERS | 14 +- + arch/arm/net/bpf_jit_32.c | 10 + + arch/s390/net/bpf_jit.h | 10 +- + arch/s390/net/bpf_jit_comp.c | 106 +- + arch/x86/net/bpf_jit_comp.c | 150 +- + crypto/af_alg.c | 4 +- + drivers/atm/he.c | 4 +- + drivers/atm/iphase.c | 2 +- + drivers/bcma/driver_gpio.c | 20 +- + drivers/block/drbd/drbd_receiver.c | 4 +- + drivers/bluetooth/Kconfig | 15 + + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/btbcm.c | 6 - + drivers/bluetooth/btintel.c | 6 - + drivers/bluetooth/btmrvl_sdio.c | 2 +- + drivers/bluetooth/btrtl.c | 390 ++ + drivers/bluetooth/btrtl.h | 52 + + drivers/bluetooth/btusb.c | 434 +- + drivers/bluetooth/btwilink.c | 2 +- + drivers/bluetooth/hci_bcsp.c | 4 +- + drivers/clk/qcom/gcc-ipq806x.c | 594 +- + drivers/infiniband/hw/cxgb4/provider.c | 8 +- + drivers/infiniband/hw/mlx4/alias_GUID.c | 7 +- + drivers/infiniband/hw/mlx4/mad.c | 11 +- + drivers/infiniband/hw/mlx4/main.c | 75 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 - + drivers/infiniband/hw/mlx5/Kconfig | 4 +- + drivers/infiniband/hw/mlx5/cq.c | 11 +- + drivers/infiniband/hw/mlx5/mad.c | 299 +- + drivers/infiniband/hw/mlx5/main.c | 648 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 23 +- + drivers/infiniband/hw/mlx5/mr.c | 3 +- + drivers/infiniband/hw/mlx5/odp.c | 47 +- + drivers/infiniband/hw/mlx5/qp.c | 89 +- + drivers/infiniband/hw/mlx5/srq.c | 11 +- + drivers/isdn/capi/capidrv.c | 4 +- + drivers/isdn/hisax/st5481_usb.c | 4 +- + drivers/isdn/mISDN/socket.c | 12 +- + drivers/mfd/janz-cmodio.c | 4 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/bonding/bond_3ad.c | 26 +- + drivers/net/bonding/bond_main.c | 55 +- + drivers/net/bonding/bond_netlink.c | 50 + + drivers/net/bonding/bond_options.c | 91 + + drivers/net/bonding/bond_procfs.c | 8 + + drivers/net/bonding/bond_sysfs.c | 46 + + drivers/net/can/flexcan.c | 53 +- + drivers/net/can/janz-ican3.c | 125 +- + drivers/net/dsa/Kconfig | 12 +- + drivers/net/dsa/bcm_sf2.c | 7 + + drivers/net/dsa/mv88e6123_61_65.c | 186 +- + drivers/net/dsa/mv88e6131.c | 185 +- + drivers/net/dsa/mv88e6171.c | 234 +- + drivers/net/dsa/mv88e6352.c | 188 +- + drivers/net/dsa/mv88e6xxx.c | 640 +- + drivers/net/dsa/mv88e6xxx.h | 99 +- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/amd/Kconfig | 4 +- + drivers/net/ethernet/amd/xgbe/xgbe-common.h | 155 + + drivers/net/ethernet/amd/xgbe/xgbe-dcb.c | 17 +- + drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 35 +- + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 99 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 341 +- + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 79 +- + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 384 +- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 1332 +++- + drivers/net/ethernet/amd/xgbe/xgbe.h | 236 +- + drivers/net/ethernet/apm/xgene/Makefile | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 36 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 8 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 207 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 30 +- + drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c | 200 + + drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h | 49 + + drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 62 +- + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 1 - + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 20 + + drivers/net/ethernet/broadcom/bcmsysport.c | 170 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 16 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 59 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 31 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 67 + + drivers/net/ethernet/broadcom/tg3.c | 2 +- + drivers/net/ethernet/cadence/macb.c | 53 +- + drivers/net/ethernet/cadence/macb.h | 9 + + drivers/net/ethernet/cavium/Kconfig | 40 + + drivers/net/ethernet/cavium/Makefile | 5 + + drivers/net/ethernet/cavium/thunder/Makefile | 11 + + drivers/net/ethernet/cavium/thunder/nic.h | 422 ++ + drivers/net/ethernet/cavium/thunder/nic_main.c | 932 +++ + drivers/net/ethernet/cavium/thunder/nic_reg.h | 213 + + .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 600 ++ + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 1331 ++++ + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 1545 +++++ + drivers/net/ethernet/cavium/thunder/nicvf_queues.h | 381 ++ + drivers/net/ethernet/cavium/thunder/q_struct.h | 701 +++ + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 966 +++ + drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 220 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 215 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 238 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 294 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 489 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 382 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2114 +++++-- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 36 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 86 +- + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 121 + + drivers/net/ethernet/chelsio/cxgb4/t4_values.h | 24 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 72 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h | 5 + + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 13 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 123 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 18 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 36 +- + drivers/net/ethernet/cisco/enic/enic_clsf.c | 31 +- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 10 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 10 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 2 +- + drivers/net/ethernet/dlink/dl2k.c | 4 +- + drivers/net/ethernet/emulex/benet/Kconfig | 9 + + drivers/net/ethernet/emulex/benet/be.h | 55 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 56 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 50 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 11 +- + drivers/net/ethernet/emulex/benet/be_hw.h | 14 +- + drivers/net/ethernet/emulex/benet/be_main.c | 500 +- + drivers/net/ethernet/emulex/benet/be_roce.c | 2 +- + drivers/net/ethernet/emulex/benet/be_roce.h | 2 +- + drivers/net/ethernet/freescale/fec_main.c | 78 + + drivers/net/ethernet/freescale/fec_ptp.c | 1 + + drivers/net/ethernet/freescale/gianfar.c | 53 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 1 - + drivers/net/ethernet/ibm/ibmveth.c | 41 +- + drivers/net/ethernet/ibm/ibmveth.h | 5 +- + drivers/net/ethernet/intel/e100.c | 6 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 19 +- + drivers/net/ethernet/intel/e1000e/80003es2lan.c | 2 +- + drivers/net/ethernet/intel/e1000e/80003es2lan.h | 2 +- + drivers/net/ethernet/intel/e1000e/82571.c | 4 +- + drivers/net/ethernet/intel/e1000e/82571.h | 2 +- + drivers/net/ethernet/intel/e1000e/defines.h | 2 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 8 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 29 +- + drivers/net/ethernet/intel/e1000e/hw.h | 2 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 26 +- + drivers/net/ethernet/intel/e1000e/ich8lan.h | 11 +- + drivers/net/ethernet/intel/e1000e/mac.c | 2 +- + drivers/net/ethernet/intel/e1000e/mac.h | 2 +- + drivers/net/ethernet/intel/e1000e/manage.c | 2 +- + drivers/net/ethernet/intel/e1000e/manage.h | 2 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 205 +- + drivers/net/ethernet/intel/e1000e/nvm.c | 2 +- + drivers/net/ethernet/intel/e1000e/nvm.h | 2 +- + drivers/net/ethernet/intel/e1000e/param.c | 2 +- + drivers/net/ethernet/intel/e1000e/phy.c | 2 +- + drivers/net/ethernet/intel/e1000e/phy.h | 2 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 2 +- + drivers/net/ethernet/intel/e1000e/regs.h | 4 +- + drivers/net/ethernet/intel/i40e/i40e.h | 5 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 30 +- + drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 11 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 39 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 146 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 7 + + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 160 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 2 +- + drivers/net/ethernet/intel/i40evf/i40e_type.h | 1 + + drivers/net/ethernet/intel/igb/igb_main.c | 38 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 44 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 106 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 9 +- + drivers/net/ethernet/marvell/mvneta.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 23 +- + drivers/net/ethernet/mellanox/mlx4/cq.c | 13 +- + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 56 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 13 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 400 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 124 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 12 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 +- + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 35 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 96 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 36 +- + drivers/net/ethernet/mellanox/mlx5/core/cq.c | 18 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 520 ++ + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 679 ++ + .../ethernet/mellanox/mlx5/core/en_flow_table.c | 860 +++ + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1899 ++++++ + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 249 + + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 344 + + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 107 + + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 23 +- + .../net/ethernet/mellanox/mlx5/core/flow_table.c | 422 ++ + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 146 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 343 +- + drivers/net/ethernet/mellanox/mlx5/core/mcg.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 21 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 232 + + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 7 + + drivers/net/ethernet/mellanox/mlx5/core/srq.c | 444 +- + drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 325 + + drivers/net/ethernet/mellanox/mlx5/core/transobj.h | 62 + + drivers/net/ethernet/mellanox/mlx5/core/uar.c | 44 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 345 + + drivers/net/ethernet/mellanox/mlx5/core/wq.c | 183 + + drivers/net/ethernet/mellanox/mlx5/core/wq.h | 171 + + drivers/net/ethernet/micrel/ksz884x.c | 4 +- + drivers/net/ethernet/moxa/moxart_ether.c | 1 - + drivers/net/ethernet/neterion/s2io.c | 6 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 3 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 77 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 4 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 46 +- + drivers/net/ethernet/rocker/rocker.c | 1579 +++-- + drivers/net/ethernet/rocker/rocker.h | 28 +- + drivers/net/ethernet/sfc/Kconfig | 9 + + drivers/net/ethernet/sfc/Makefile | 2 +- + drivers/net/ethernet/sfc/ef10.c | 1147 +++- + drivers/net/ethernet/sfc/ef10_sriov.c | 783 +++ + drivers/net/ethernet/sfc/ef10_sriov.h | 69 + + drivers/net/ethernet/sfc/efx.c | 316 +- + drivers/net/ethernet/sfc/efx.h | 15 + + drivers/net/ethernet/sfc/enum.h | 2 + + drivers/net/ethernet/sfc/ethtool.c | 7 +- + drivers/net/ethernet/sfc/falcon.c | 33 +- + drivers/net/ethernet/sfc/farch.c | 64 +- + drivers/net/ethernet/sfc/mcdi.c | 228 +- + drivers/net/ethernet/sfc/mcdi.h | 16 +- + drivers/net/ethernet/sfc/mcdi_pcol.h | 434 +- + drivers/net/ethernet/sfc/mcdi_port.c | 13 +- + drivers/net/ethernet/sfc/net_driver.h | 34 +- + drivers/net/ethernet/sfc/nic.h | 251 +- + drivers/net/ethernet/sfc/ptp.c | 40 +- + drivers/net/ethernet/sfc/siena.c | 27 +- + drivers/net/ethernet/sfc/siena_sriov.c | 156 +- + drivers/net/ethernet/sfc/siena_sriov.h | 79 + + drivers/net/ethernet/sfc/sriov.c | 83 + + drivers/net/ethernet/sfc/sriov.h | 31 + + drivers/net/ethernet/stmicro/stmmac/Kconfig | 90 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 14 +- + .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 41 + + .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 365 ++ + .../net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c | 99 + + drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 24 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 27 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 21 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 29 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 25 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 14 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 64 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 19 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 129 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.h | 9 +- + drivers/net/ethernet/ti/cpsw.c | 9 +- + drivers/net/ethernet/ti/cpsw_ale.c | 45 - + drivers/net/ethernet/ti/cpsw_ale.h | 2 - + drivers/net/ethernet/ti/netcp_core.c | 3 +- + drivers/net/ethernet/tile/tilepro.c | 3 - + drivers/net/ethernet/toshiba/spider_net.c | 3 +- + drivers/net/ethernet/via/via-rhine.c | 249 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 16 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 108 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 288 +- + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 30 +- + drivers/net/fddi/skfp/srf.c | 2 +- + drivers/net/geneve.c | 523 ++ + drivers/net/hyperv/hyperv_net.h | 10 + + drivers/net/hyperv/netvsc.c | 54 +- + drivers/net/hyperv/netvsc_drv.c | 97 +- + drivers/net/hyperv/rndis_filter.c | 16 +- + drivers/net/ieee802154/Kconfig | 10 + + drivers/net/ieee802154/Makefile | 1 + + drivers/net/ieee802154/at86rf230.c | 376 +- + drivers/net/ieee802154/at86rf230.h | 220 + + drivers/net/ieee802154/atusb.c | 699 +++ + drivers/net/ieee802154/atusb.h | 84 + + drivers/net/ieee802154/cc2520.c | 2 +- + drivers/net/ieee802154/fakelb.c | 209 +- + drivers/net/ieee802154/mrf24j40.c | 2 +- + drivers/net/ipvlan/ipvlan.h | 5 + + drivers/net/ipvlan/ipvlan_core.c | 138 +- + drivers/net/ipvlan/ipvlan_main.c | 25 +- + drivers/net/irda/irda-usb.c | 4 +- + drivers/net/macvtap.c | 34 +- + drivers/net/phy/Kconfig | 13 +- + drivers/net/phy/Makefile | 2 +- + drivers/net/phy/amd-xgbe-phy.c | 1901 ------ + drivers/net/phy/bcm7xxx.c | 7 +- + drivers/net/phy/dp83867.c | 239 + + drivers/net/phy/icplus.c | 5 +- + drivers/net/phy/marvell.c | 10 +- + drivers/net/phy/mdio-bitbang.c | 7 +- + drivers/net/phy/mdio-gpio.c | 1 + + drivers/net/phy/micrel.c | 53 +- + drivers/net/phy/phy.c | 34 +- + drivers/net/ppp/pppoe.c | 4 +- + drivers/net/ppp/pppox.c | 2 +- + drivers/net/ppp/pptp.c | 4 +- + drivers/net/team/team.c | 10 +- + drivers/net/tun.c | 26 +- + drivers/net/vxlan.c | 10 +- + drivers/net/wan/cosa.c | 2 +- + drivers/net/wan/dscc4.c | 9 +- + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 2 + + drivers/net/wireless/adm8211.c | 27 +- + drivers/net/wireless/at76c50x-usb.h | 2 +- + drivers/net/wireless/ath/ar5523/ar5523.c | 3 +- + drivers/net/wireless/ath/ath.h | 2 + + drivers/net/wireless/ath/ath10k/Makefile | 4 +- + drivers/net/wireless/ath/ath10k/core.c | 165 +- + drivers/net/wireless/ath/ath10k/core.h | 56 +- + drivers/net/wireless/ath/ath10k/debug.c | 127 +- + drivers/net/wireless/ath/ath10k/debug.h | 1 + + drivers/net/wireless/ath/ath10k/htc.c | 50 +- + drivers/net/wireless/ath/ath10k/htt.c | 98 + + drivers/net/wireless/ath/ath10k/htt.h | 132 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 208 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 34 +- + drivers/net/wireless/ath/ath10k/hw.h | 53 +- + drivers/net/wireless/ath/ath10k/mac.c | 2831 ++++++--- + drivers/net/wireless/ath/ath10k/mac.h | 29 + + drivers/net/wireless/ath/ath10k/p2p.c | 156 + + drivers/net/wireless/ath/ath10k/p2p.h | 28 + + drivers/net/wireless/ath/ath10k/pci.c | 356 +- + drivers/net/wireless/ath/ath10k/pci.h | 95 +- + drivers/net/wireless/ath/ath10k/rx_desc.h | 22 + + drivers/net/wireless/ath/ath10k/spectral.c | 5 +- + drivers/net/wireless/ath/ath10k/thermal.c | 134 +- + drivers/net/wireless/ath/ath10k/thermal.h | 10 +- + drivers/net/wireless/ath/ath10k/trace.h | 22 +- + drivers/net/wireless/ath/ath10k/txrx.c | 9 +- + drivers/net/wireless/ath/ath10k/wmi-ops.h | 194 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 579 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 168 + + drivers/net/wireless/ath/ath10k/wmi.c | 276 +- + drivers/net/wireless/ath/ath10k/wmi.h | 230 +- + drivers/net/wireless/ath/ath10k/wow.c | 321 + + drivers/net/wireless/ath/ath10k/wow.h | 40 + + drivers/net/wireless/ath/ath5k/ath5k.h | 1 - + drivers/net/wireless/ath/ath5k/led.c | 2 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 16 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 155 +- + drivers/net/wireless/ath/ath9k/ar9002_phy.c | 144 +- + drivers/net/wireless/ath/ath9k/common-spectral.c | 740 ++- + drivers/net/wireless/ath/ath9k/common-spectral.h | 35 +- + drivers/net/wireless/ath/ath9k/htc.h | 6 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 3 +- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 9 +- + drivers/net/wireless/ath/ath9k/hw.h | 2 + + drivers/net/wireless/ath/ath9k/main.c | 3 +- + drivers/net/wireless/ath/ath9k/recv.c | 5 - + drivers/net/wireless/ath/carl9170/fw.c | 3 +- + drivers/net/wireless/ath/carl9170/led.c | 2 +- + drivers/net/wireless/ath/carl9170/main.c | 7 +- + drivers/net/wireless/ath/carl9170/usb.c | 5 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 72 +- + drivers/net/wireless/ath/dfs_pattern_detector.h | 4 + + drivers/net/wireless/ath/dfs_pri_detector.c | 4 + + drivers/net/wireless/ath/wil6210/Makefile | 1 + + drivers/net/wireless/ath/wil6210/cfg80211.c | 128 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 107 +- + drivers/net/wireless/ath/wil6210/main.c | 31 +- + drivers/net/wireless/ath/wil6210/netdev.c | 5 + + drivers/net/wireless/ath/wil6210/pcie_bus.c | 6 - + drivers/net/wireless/ath/wil6210/pmc.c | 375 ++ + drivers/net/wireless/ath/wil6210/pmc.h | 27 + + drivers/net/wireless/ath/wil6210/txrx.c | 48 +- + drivers/net/wireless/ath/wil6210/txrx.h | 24 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 24 +- + drivers/net/wireless/ath/wil6210/wmi.c | 70 +- + drivers/net/wireless/ath/wil6210/wmi.h | 40 +- + drivers/net/wireless/b43/main.c | 8 +- + drivers/net/wireless/b43legacy/main.c | 8 +- + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 36 +- + drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 206 +- + drivers/net/wireless/brcm80211/brcmfmac/chip.c | 1 + + .../net/wireless/brcm80211/brcmfmac/commonring.c | 18 - + drivers/net/wireless/brcm80211/brcmfmac/feature.c | 1 + + drivers/net/wireless/brcm80211/brcmfmac/feature.h | 4 + + drivers/net/wireless/brcm80211/brcmfmac/firmware.c | 217 +- + drivers/net/wireless/brcm80211/brcmfmac/firmware.h | 6 + + drivers/net/wireless/brcm80211/brcmfmac/flowring.c | 5 +- + drivers/net/wireless/brcm80211/brcmfmac/flowring.h | 4 +- + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 20 +- + drivers/net/wireless/brcm80211/brcmfmac/of.c | 11 +- + drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 184 +- + drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 11 +- + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 9 +- + .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 5 +- + drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +- + .../net/wireless/brcm80211/include/brcm_hw_ids.h | 3 + + drivers/net/wireless/cw1200/sta.c | 10 +- + drivers/net/wireless/iwlegacy/3945-mac.c | 4 +- + drivers/net/wireless/iwlegacy/4965-mac.c | 4 +- + drivers/net/wireless/iwlwifi/Kconfig | 12 +- + drivers/net/wireless/iwlwifi/Makefile | 1 + + drivers/net/wireless/iwlwifi/dvm/mac80211.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-7000.c | 25 +- + drivers/net/wireless/iwlwifi/iwl-8000.c | 71 +- + drivers/net/wireless/iwlwifi/iwl-config.h | 45 + + .../net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h | 15 +- + drivers/net/wireless/iwlwifi/iwl-drv.c | 32 +- + drivers/net/wireless/iwlwifi/iwl-fh.h | 6 - + drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-fw-file.h | 107 +- + drivers/net/wireless/iwlwifi/iwl-fw.h | 24 +- + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 3 + + drivers/net/wireless/iwlwifi/iwl-trans.c | 113 + + drivers/net/wireless/iwlwifi/iwl-trans.h | 22 +- + drivers/net/wireless/iwlwifi/mvm/coex.c | 103 +- + drivers/net/wireless/iwlwifi/mvm/d3.c | 22 +- + drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 21 +- + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 14 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 91 +- + drivers/net/wireless/iwlwifi/mvm/fw-api.h | 63 +- + drivers/net/wireless/iwlwifi/mvm/fw.c | 23 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 413 +- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 162 +- + drivers/net/wireless/iwlwifi/mvm/nvm.c | 16 +- + drivers/net/wireless/iwlwifi/mvm/ops.c | 37 +- + drivers/net/wireless/iwlwifi/mvm/rs.c | 44 +- + drivers/net/wireless/iwlwifi/mvm/rs.h | 2 - + drivers/net/wireless/iwlwifi/mvm/rx.c | 4 +- + drivers/net/wireless/iwlwifi/mvm/scan.c | 1418 ++--- + drivers/net/wireless/iwlwifi/mvm/sta.c | 14 +- + drivers/net/wireless/iwlwifi/mvm/time-event.c | 33 +- + drivers/net/wireless/iwlwifi/mvm/tt.c | 40 +- + drivers/net/wireless/iwlwifi/mvm/tx.c | 35 +- + drivers/net/wireless/iwlwifi/mvm/utils.c | 2 +- + drivers/net/wireless/iwlwifi/pcie/drv.c | 17 +- + drivers/net/wireless/iwlwifi/pcie/internal.h | 51 +- + drivers/net/wireless/iwlwifi/pcie/rx.c | 415 +- + drivers/net/wireless/iwlwifi/pcie/trans.c | 135 +- + drivers/net/wireless/iwlwifi/pcie/tx.c | 2 - + drivers/net/wireless/libertas/cfg.c | 13 +- + drivers/net/wireless/libertas/cfg.h | 3 +- + drivers/net/wireless/libertas/cmd.h | 3 +- + drivers/net/wireless/libertas/cmdresp.c | 13 +- + drivers/net/wireless/libertas_tf/main.c | 7 +- + drivers/net/wireless/mac80211_hwsim.c | 55 +- + drivers/net/wireless/mediatek/Kconfig | 10 + + drivers/net/wireless/mediatek/Makefile | 1 + + drivers/net/wireless/mediatek/mt7601u/Kconfig | 6 + + drivers/net/wireless/mediatek/mt7601u/Makefile | 9 + + drivers/net/wireless/mediatek/mt7601u/core.c | 78 + + drivers/net/wireless/mediatek/mt7601u/debugfs.c | 172 + + drivers/net/wireless/mediatek/mt7601u/dma.c | 533 ++ + drivers/net/wireless/mediatek/mt7601u/dma.h | 127 + + drivers/net/wireless/mediatek/mt7601u/eeprom.c | 414 ++ + drivers/net/wireless/mediatek/mt7601u/eeprom.h | 151 + + drivers/net/wireless/mediatek/mt7601u/init.c | 625 ++ + drivers/net/wireless/mediatek/mt7601u/initvals.h | 164 + + .../net/wireless/mediatek/mt7601u/initvals_phy.h | 291 + + drivers/net/wireless/mediatek/mt7601u/mac.c | 569 ++ + drivers/net/wireless/mediatek/mt7601u/mac.h | 178 + + drivers/net/wireless/mediatek/mt7601u/main.c | 412 ++ + drivers/net/wireless/mediatek/mt7601u/mcu.c | 534 ++ + drivers/net/wireless/mediatek/mt7601u/mcu.h | 94 + + drivers/net/wireless/mediatek/mt7601u/mt7601u.h | 390 ++ + drivers/net/wireless/mediatek/mt7601u/phy.c | 1251 ++++ + drivers/net/wireless/mediatek/mt7601u/regs.h | 636 ++ + drivers/net/wireless/mediatek/mt7601u/trace.c | 21 + + drivers/net/wireless/mediatek/mt7601u/trace.h | 400 ++ + drivers/net/wireless/mediatek/mt7601u/tx.c | 319 + + drivers/net/wireless/mediatek/mt7601u/usb.c | 360 ++ + drivers/net/wireless/mediatek/mt7601u/usb.h | 77 + + drivers/net/wireless/mediatek/mt7601u/util.c | 42 + + drivers/net/wireless/mediatek/mt7601u/util.h | 77 + + drivers/net/wireless/mwifiex/11h.c | 48 +- + drivers/net/wireless/mwifiex/11n.c | 24 +- + drivers/net/wireless/mwifiex/11n_aggr.c | 7 +- + drivers/net/wireless/mwifiex/11n_rxreorder.c | 51 +- + drivers/net/wireless/mwifiex/Kconfig | 2 + + drivers/net/wireless/mwifiex/README | 6 +- + drivers/net/wireless/mwifiex/cfg80211.c | 462 +- + drivers/net/wireless/mwifiex/cfp.c | 50 +- + drivers/net/wireless/mwifiex/cmdevt.c | 365 +- + drivers/net/wireless/mwifiex/debugfs.c | 165 +- + drivers/net/wireless/mwifiex/ethtool.c | 97 - + drivers/net/wireless/mwifiex/fw.h | 9 + + drivers/net/wireless/mwifiex/init.c | 54 +- + drivers/net/wireless/mwifiex/ioctl.h | 6 + + drivers/net/wireless/mwifiex/join.c | 222 +- + drivers/net/wireless/mwifiex/main.c | 224 +- + drivers/net/wireless/mwifiex/main.h | 59 +- + drivers/net/wireless/mwifiex/pcie.c | 589 +- + drivers/net/wireless/mwifiex/scan.c | 377 +- + drivers/net/wireless/mwifiex/sdio.c | 458 +- + drivers/net/wireless/mwifiex/sta_cmd.c | 159 +- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 197 +- + drivers/net/wireless/mwifiex/sta_event.c | 132 +- + drivers/net/wireless/mwifiex/sta_ioctl.c | 147 +- + drivers/net/wireless/mwifiex/sta_rx.c | 13 +- + drivers/net/wireless/mwifiex/sta_tx.c | 18 +- + drivers/net/wireless/mwifiex/tdls.c | 86 +- + drivers/net/wireless/mwifiex/txrx.c | 30 +- + drivers/net/wireless/mwifiex/uap_cmd.c | 22 +- + drivers/net/wireless/mwifiex/uap_event.c | 44 +- + drivers/net/wireless/mwifiex/uap_txrx.c | 36 +- + drivers/net/wireless/mwifiex/usb.c | 141 +- + drivers/net/wireless/mwifiex/util.c | 34 +- + drivers/net/wireless/mwifiex/wmm.c | 107 +- + drivers/net/wireless/mwl8k.c | 2 +- + drivers/net/wireless/p54/fwio.c | 3 +- + drivers/net/wireless/p54/led.c | 2 +- + drivers/net/wireless/p54/main.c | 6 +- + drivers/net/wireless/ray_cs.c | 2 +- + drivers/net/wireless/rndis_wlan.c | 8 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 4 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 4 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 4 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 19 +- + drivers/net/wireless/rt2x00/rt2800lib.h | 5 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2800soc.c | 2 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +- + drivers/net/wireless/rt2x00/rt61pci.c | 4 +- + drivers/net/wireless/rt2x00/rt73usb.c | 4 +- + drivers/net/wireless/rtlwifi/Kconfig | 2 +- + .../wireless/rtlwifi/btcoexist/halbtc8723b2ant.c | 7 +- + drivers/net/wireless/rtlwifi/core.h | 3 +- + drivers/net/wireless/rtlwifi/regd.c | 42 +- + drivers/net/wireless/rtlwifi/regd.h | 1 + + drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 20 +- + drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 3 +- + drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/mac.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ee/fw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ee/hw.c | 21 +- + drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 13 - + drivers/net/wireless/rtlwifi/rtl8723be/fw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 21 +- + drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 24 +- + drivers/net/wireless/ti/wl1251/main.c | 9 +- + drivers/net/wireless/ti/wl18xx/main.c | 71 +- + drivers/net/wireless/ti/wl18xx/reg.h | 1 + + drivers/net/wireless/ti/wlcore/main.c | 32 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 4 +- + drivers/net/xen-netback/netback.c | 2 +- + drivers/net/xen-netfront.c | 5 +- + drivers/of/of_mdio.c | 3 + + drivers/s390/net/lcs.c | 2 +- + drivers/s390/net/qeth_core.h | 2 + + drivers/s390/net/qeth_core_main.c | 3 +- + drivers/s390/net/qeth_core_mpc.c | 3 +- + drivers/s390/net/qeth_core_mpc.h | 3 +- + drivers/s390/net/qeth_l2_main.c | 124 +- + drivers/s390/net/qeth_l2_sys.c | 74 +- + drivers/s390/net/qeth_l3_main.c | 9 +- + drivers/scsi/cxgbi/libcxgbi.c | 2 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 1 + + drivers/scsi/qla4xxx/ql4_def.h | 1 + + drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 2 +- + drivers/staging/vt6655/device_main.c | 11 +- + drivers/staging/vt6656/main_usb.c | 11 +- + drivers/staging/wlan-ng/cfg80211.c | 2 +- + drivers/target/iscsi/iscsi_target.c | 1 + + drivers/target/target_core_file.c | 1 + + drivers/target/target_core_pr.c | 1 + + drivers/target/target_core_transport.c | 1 + + drivers/target/target_core_user.c | 1 + + drivers/vhost/scsi.c | 1 + + fs/afs/rxrpc.c | 2 +- + fs/dlm/lowcomms.c | 16 +- + fs/splice.c | 1 + + include/dt-bindings/clock/qcom,gcc-ipq806x.h | 2 + + include/dt-bindings/net/ti-dp83867.h | 45 + + include/dt-bindings/reset/qcom,gcc-ipq806x.h | 43 + + include/linux/bcma/bcma.h | 9 + + include/linux/bpf.h | 32 +- + include/linux/etherdevice.h | 42 +- + include/linux/filter.h | 30 +- + include/linux/gfp.h | 5 + + include/linux/if_pppox.h | 2 +- + include/linux/if_vlan.h | 28 +- + include/linux/igmp.h | 1 + + include/linux/mdio-gpio.h | 3 +- + include/linux/mlx4/device.h | 11 +- + include/linux/mlx5/cq.h | 3 + + include/linux/mlx5/device.h | 211 +- + include/linux/mlx5/driver.h | 171 +- + include/linux/mlx5/flow_table.h | 54 + + include/linux/mlx5/mlx5_ifc.h | 6622 +++++++++++++++++++- + include/linux/mlx5/qp.h | 25 + + include/linux/mlx5/vport.h | 55 + + include/linux/mm_types.h | 18 + + include/linux/net.h | 3 +- + include/linux/netdev_features.h | 5 +- + include/linux/netdevice.h | 27 +- + include/linux/netfilter.h | 39 +- + include/linux/netfilter/ipset/ip_set.h | 32 +- + include/linux/netfilter/x_tables.h | 2 + + include/linux/netfilter_ingress.h | 41 + + include/linux/netlink.h | 2 + + include/linux/pci_ids.h | 2 + + include/linux/phy.h | 14 + + include/linux/rtnetlink.h | 10 +- + include/linux/skbuff.h | 61 +- + include/linux/stmmac.h | 1 + + include/linux/tcp.h | 15 +- + include/net/addrconf.h | 1 + + include/net/af_vsock.h | 2 +- + include/net/bond_options.h | 3 + + include/net/bonding.h | 3 + + include/net/cfg80211.h | 8 +- + include/net/cfg802154.h | 70 +- + include/net/checksum.h | 4 +- + include/net/codel.h | 12 +- + include/net/dst.h | 18 - + include/net/flow_dissector.h | 220 + + include/net/flow_keys.h | 45 - + include/net/geneve.h | 5 + + include/net/ieee802154_netdev.h | 16 - + include/net/inet_common.h | 2 +- + include/net/inet_frag.h | 2 +- + include/net/inet_hashtables.h | 49 +- + include/net/inet_sock.h | 1 + + include/net/ip.h | 43 +- + include/net/ip6_fib.h | 45 +- + include/net/ip6_route.h | 21 +- + include/net/ipv6.h | 43 +- + include/net/llc_conn.h | 2 +- + include/net/mac80211.h | 159 +- + include/net/mac802154.h | 38 +- + include/net/net_namespace.h | 3 + + include/net/netfilter/nf_tables.h | 8 + + include/net/netns/ipv4.h | 3 + + include/net/netns/ipv6.h | 1 + + include/net/netns/nftables.h | 1 + + include/net/nl802154.h | 79 + + include/net/request_sock.h | 4 +- + include/net/sch_generic.h | 23 - + include/net/sock.h | 30 +- + include/net/switchdev.h | 257 +- + include/net/tcp.h | 82 +- + include/uapi/linux/bpf.h | 24 + + include/uapi/linux/can.h | 6 + + include/uapi/linux/ethtool.h | 31 +- + include/uapi/linux/if_link.h | 14 + + include/uapi/linux/if_packet.h | 7 + + include/uapi/linux/in.h | 3 + + include/uapi/linux/ipv6_route.h | 1 + + include/uapi/linux/netfilter.h | 6 + + include/uapi/linux/netfilter/nf_tables.h | 2 + + include/uapi/linux/netlink.h | 1 + + include/uapi/linux/nl80211.h | 28 +- + include/uapi/linux/openvswitch.h | 4 + + include/uapi/linux/pkt_cls.h | 57 +- + include/uapi/linux/pkt_sched.h | 7 +- + include/uapi/linux/rds.h | 10 + + include/uapi/linux/snmp.h | 2 + + include/uapi/linux/tcp.h | 6 +- + kernel/bpf/arraymap.c | 113 +- + kernel/bpf/core.c | 98 +- + kernel/bpf/helpers.c | 47 +- + kernel/bpf/syscall.c | 42 +- + kernel/bpf/verifier.c | 54 +- + kernel/seccomp.c | 70 +- + kernel/trace/bpf_trace.c | 14 +- + lib/rhashtable.c | 8 +- + lib/test_bpf.c | 2972 ++++++++- + lib/test_rhashtable.c | 215 +- + mm/page_alloc.c | 98 + + net/8021q/vlan.c | 96 + + net/Kconfig | 3 + + net/appletalk/ddp.c | 2 +- + net/atm/common.c | 4 +- + net/atm/common.h | 2 +- + net/atm/pvc.c | 2 +- + net/atm/svc.c | 2 +- + net/ax25/af_ax25.c | 4 +- + net/batman-adv/Makefile | 6 +- + net/batman-adv/bat_algo.h | 2 +- + net/batman-adv/bat_iv_ogm.c | 210 +- + net/batman-adv/bitarray.c | 6 +- + net/batman-adv/bitarray.h | 8 +- + net/batman-adv/bridge_loop_avoidance.c | 56 +- + net/batman-adv/bridge_loop_avoidance.h | 12 +- + net/batman-adv/debugfs.c | 47 +- + net/batman-adv/debugfs.h | 43 +- + net/batman-adv/distributed-arp-table.c | 47 +- + net/batman-adv/distributed-arp-table.h | 15 +- + net/batman-adv/fragmentation.c | 44 +- + net/batman-adv/fragmentation.h | 11 +- + net/batman-adv/gateway_client.c | 41 +- + net/batman-adv/gateway_client.h | 10 +- + net/batman-adv/gateway_common.c | 13 +- + net/batman-adv/gateway_common.h | 9 +- + net/batman-adv/hard-interface.c | 40 +- + net/batman-adv/hard-interface.h | 13 +- + net/batman-adv/hash.c | 8 +- + net/batman-adv/hash.h | 33 +- + net/batman-adv/icmp_socket.c | 35 +- + net/batman-adv/icmp_socket.h | 9 +- + net/batman-adv/main.c | 103 +- + net/batman-adv/main.h | 40 +- + net/batman-adv/multicast.c | 31 +- + net/batman-adv/multicast.h | 8 +- + net/batman-adv/network-coding.c | 53 +- + net/batman-adv/network-coding.h | 15 +- + net/batman-adv/originator.c | 36 +- + net/batman-adv/originator.h | 28 +- + net/batman-adv/packet.h | 5 +- + net/batman-adv/routing.c | 38 +- + net/batman-adv/routing.h | 12 +- + net/batman-adv/send.c | 40 +- + net/batman-adv/send.h | 15 +- + net/batman-adv/soft-interface.c | 72 +- + net/batman-adv/soft-interface.h | 13 +- + net/batman-adv/sysfs.c | 62 +- + net/batman-adv/sysfs.h | 12 +- + net/batman-adv/translation-table.c | 91 +- + net/batman-adv/translation-table.h | 11 +- + net/batman-adv/types.h | 33 +- + net/bluetooth/6lowpan.c | 2 +- + net/bluetooth/bnep/sock.c | 2 +- + net/bluetooth/cmtp/sock.c | 2 +- + net/bluetooth/hci_core.c | 5 - + net/bluetooth/hci_sock.c | 2 +- + net/bluetooth/hidp/sock.c | 2 +- + net/bluetooth/l2cap_sock.c | 10 +- + net/bluetooth/mgmt.c | 6 +- + net/bluetooth/rfcomm/core.c | 2 +- + net/bluetooth/rfcomm/sock.c | 8 +- + net/bluetooth/sco.c | 8 +- + net/bluetooth/smp.c | 20 +- + net/bridge/br.c | 22 +- + net/bridge/br_fdb.c | 6 + + net/bridge/br_multicast.c | 262 +- + net/bridge/br_netfilter.c | 40 +- + net/bridge/br_netlink.c | 24 +- + net/bridge/br_private.h | 4 +- + net/bridge/br_stp.c | 6 +- + net/bridge/netfilter/ebt_stp.c | 6 +- + net/bridge/netfilter/ebtables.c | 2 +- + net/caif/caif_socket.c | 2 +- + net/can/af_can.c | 2 +- + net/ceph/messenger.c | 4 +- + net/core/dev.c | 220 +- + net/core/ethtool.c | 1 - + net/core/filter.c | 259 +- + net/core/flow_dissector.c | 637 +- + net/core/neighbour.c | 3 + + net/core/net-sysfs.c | 10 +- + net/core/net_namespace.c | 133 +- + net/core/netevent.c | 5 +- + net/core/pktgen.c | 110 +- + net/core/rtnetlink.c | 12 +- + net/core/secure_seq.c | 2 +- + net/core/skbuff.c | 387 +- + net/core/sock.c | 44 +- + net/core/stream.c | 6 +- + net/core/utils.c | 12 +- + net/decnet/af_decnet.c | 8 +- + net/dsa/slave.c | 54 +- + net/ethernet/eth.c | 15 +- + net/ieee802154/6lowpan/core.c | 28 - + net/ieee802154/6lowpan/tx.c | 2 +- + net/ieee802154/core.c | 2 - + net/ieee802154/nl-mac.c | 39 +- + net/ieee802154/nl-phy.c | 10 +- + net/ieee802154/nl802154.c | 276 +- + net/ieee802154/rdev-ops.h | 23 + + net/ieee802154/socket.c | 22 +- + net/ieee802154/trace.h | 32 +- + net/ipv4/Kconfig | 4 +- + net/ipv4/Makefile | 2 +- + net/ipv4/af_inet.c | 11 +- + net/ipv4/fib_semantics.c | 4 - + net/ipv4/fib_trie.c | 62 +- + net/ipv4/{geneve.c => geneve_core.c} | 10 +- + net/ipv4/igmp.c | 162 + + net/ipv4/inet_connection_sock.c | 19 +- + net/ipv4/inet_hashtables.c | 57 +- + net/ipv4/inet_timewait_sock.c | 2 +- + net/ipv4/ip_forward.c | 18 +- + net/ipv4/ip_fragment.c | 46 +- + net/ipv4/ip_output.c | 82 +- + net/ipv4/ip_sockglue.c | 7 + + net/ipv4/ip_tunnel_core.c | 20 +- + net/ipv4/ipip.c | 3 +- + net/ipv4/netfilter/ip_tables.c | 4 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 5 + + net/ipv4/netfilter/ipt_SYNPROXY.c | 4 +- + net/ipv4/proc.c | 2 + + net/ipv4/route.c | 23 +- + net/ipv4/syncookies.c | 10 +- + net/ipv4/sysctl_net_ipv4.c | 25 +- + net/ipv4/tcp.c | 89 +- + net/ipv4/tcp_input.c | 124 +- + net/ipv4/tcp_ipv4.c | 15 +- + net/ipv4/tcp_minisocks.c | 4 + + net/ipv4/tcp_output.c | 57 +- + net/ipv4/tcp_timer.c | 4 +- + net/ipv4/udp_tunnel.c | 8 +- + net/ipv6/Makefile | 1 + + net/ipv6/addrconf.c | 2 + + net/ipv6/af_inet6.c | 6 +- + net/ipv6/icmp.c | 6 +- + net/ipv6/inet6_hashtables.c | 8 +- + net/ipv6/ip6_fib.c | 25 +- + net/ipv6/ip6_flowlabel.c | 4 + + net/ipv6/ip6_output.c | 60 +- + net/ipv6/ip6_tunnel.c | 2 +- + net/ipv6/ip6_udp_tunnel.c | 6 +- + net/ipv6/mcast_snoop.c | 213 + + net/ipv6/ndisc.c | 2 +- + net/ipv6/netfilter/ip6_tables.c | 4 +- + net/ipv6/output_core.c | 13 +- + net/ipv6/raw.c | 11 +- + net/ipv6/route.c | 561 +- + net/ipv6/syncookies.c | 19 +- + net/ipv6/sysctl_net_ipv6.c | 8 + + net/ipv6/tcp_ipv6.c | 14 +- + net/ipv6/xfrm6_policy.c | 20 +- + net/ipx/af_ipx.c | 2 +- + net/irda/af_irda.c | 2 +- + net/irda/timer.c | 4 +- + net/iucv/af_iucv.c | 10 +- + net/key/af_key.c | 2 +- + net/l2tp/l2tp_core.c | 15 +- + net/l2tp/l2tp_ppp.c | 4 +- + net/llc/af_llc.c | 2 +- + net/llc/llc_conn.c | 6 +- + net/mac80211/Kconfig | 16 +- + net/mac80211/cfg.c | 118 +- + net/mac80211/chan.c | 10 + + net/mac80211/debugfs.c | 74 +- + net/mac80211/debugfs_sta.c | 85 - + net/mac80211/driver-ops.h | 11 +- + net/mac80211/ethtool.c | 3 +- + net/mac80211/ibss.c | 5 +- + net/mac80211/ieee80211_i.h | 36 +- + net/mac80211/iface.c | 64 +- + net/mac80211/key.c | 12 +- + net/mac80211/key.h | 3 +- + net/mac80211/led.c | 268 +- + net/mac80211/led.h | 44 +- + net/mac80211/main.c | 20 +- + net/mac80211/mesh_plink.c | 37 +- + net/mac80211/mlme.c | 83 +- + net/mac80211/rate.c | 8 +- + net/mac80211/rate.h | 14 +- + net/mac80211/rx.c | 201 +- + net/mac80211/sta_info.c | 10 +- + net/mac80211/sta_info.h | 41 +- + net/mac80211/status.c | 28 +- + net/mac80211/tdls.c | 33 +- + net/mac80211/trace.h | 42 +- + net/mac80211/tx.c | 528 +- + net/mac802154/Kconfig | 1 + + net/mac802154/cfg.c | 101 +- + net/mac802154/driver-ops.h | 8 +- + net/mac802154/ieee802154_i.h | 7 - + net/mac802154/iface.c | 30 +- + net/mac802154/mac_cmd.c | 42 +- + net/mac802154/main.c | 32 + + net/mac802154/mib.c | 63 +- + net/mac802154/rx.c | 5 - + net/mac802154/util.c | 5 +- + net/mpls/mpls_gso.c | 2 + + net/netfilter/Kconfig | 13 + + net/netfilter/Makefile | 1 + + net/netfilter/core.c | 37 +- + net/netfilter/ipset/ip_set_bitmap_ip.c | 17 +- + net/netfilter/ipset/ip_set_bitmap_ipmac.c | 13 +- + net/netfilter/ipset/ip_set_bitmap_port.c | 3 +- + net/netfilter/ipset/ip_set_core.c | 49 +- + net/netfilter/ipset/ip_set_getport.c | 6 +- + net/netfilter/ipset/ip_set_hash_gen.h | 22 +- + net/netfilter/ipset/ip_set_hash_ip.c | 33 +- + net/netfilter/ipset/ip_set_hash_ipmark.c | 43 +- + net/netfilter/ipset/ip_set_hash_ipport.c | 49 +- + net/netfilter/ipset/ip_set_hash_ipportip.c | 40 +- + net/netfilter/ipset/ip_set_hash_ipportnet.c | 40 +- + net/netfilter/ipset/ip_set_hash_mac.c | 11 +- + net/netfilter/ipset/ip_set_hash_net.c | 28 +- + net/netfilter/ipset/ip_set_hash_netiface.c | 29 +- + net/netfilter/ipset/ip_set_hash_netnet.c | 30 +- + net/netfilter/ipset/ip_set_hash_netport.c | 38 +- + net/netfilter/ipset/ip_set_hash_netportnet.c | 52 +- + net/netfilter/ipset/ip_set_list_set.c | 3 +- + net/netfilter/ipvs/ip_vs_sync.c | 30 +- + net/netfilter/ipvs/ip_vs_xmit.c | 19 +- + net/netfilter/nf_conntrack_h323_main.c | 4 +- + net/netfilter/nf_tables_api.c | 46 +- + net/netfilter/nf_tables_netdev.c | 183 + + net/netfilter/nfnetlink_queue_core.c | 2 +- + net/netfilter/nft_compat.c | 2 + + net/netfilter/x_tables.c | 18 +- + net/netfilter/xt_TCPMSS.c | 6 + + net/netfilter/xt_TEE.c | 1 + + net/netfilter/xt_addrtype.c | 2 +- + net/netfilter/xt_mark.c | 1 + + net/netfilter/xt_set.c | 3 +- + net/netlink/af_netlink.c | 148 +- + net/netrom/af_netrom.c | 4 +- + net/nfc/af_nfc.c | 2 +- + net/nfc/llcp.h | 2 +- + net/nfc/llcp_core.c | 2 +- + net/nfc/llcp_sock.c | 8 +- + net/nfc/nfc.h | 2 +- + net/nfc/rawsock.c | 4 +- + net/openvswitch/Kconfig | 2 +- + net/openvswitch/actions.c | 23 +- + net/openvswitch/datapath.c | 20 +- + net/openvswitch/datapath.h | 2 + + net/openvswitch/flow.c | 4 +- + net/openvswitch/flow_netlink.c | 2 +- + net/openvswitch/vport-geneve.c | 5 - + net/packet/af_packet.c | 173 +- + net/packet/internal.h | 12 +- + net/phonet/af_phonet.c | 2 +- + net/phonet/pep.c | 2 +- + net/rds/af_rds.c | 43 +- + net/rds/bind.c | 4 + + net/rds/rds.h | 6 +- + net/rds/transport.c | 21 + + net/rfkill/core.c | 12 +- + net/rfkill/rfkill-gpio.c | 24 +- + net/rose/af_rose.c | 4 +- + net/rxrpc/af_rxrpc.c | 2 +- + net/rxrpc/ar-local.c | 4 +- + net/sched/Kconfig | 11 + + net/sched/Makefile | 1 + + net/sched/act_api.c | 5 - + net/sched/act_bpf.c | 9 +- + net/sched/act_mirred.c | 2 +- + net/sched/act_pedit.c | 5 +- + net/sched/cls_bpf.c | 16 +- + net/sched/cls_flow.c | 28 +- + net/sched/cls_flower.c | 691 ++ + net/sched/sch_api.c | 12 +- + net/sched/sch_choke.c | 20 +- + net/sched/sch_codel.c | 15 +- + net/sched/sch_fq_codel.c | 26 +- + net/sched/sch_gred.c | 28 +- + net/sched/sch_hhf.c | 19 +- + net/sched/sch_ingress.c | 59 +- + net/sched/sch_netem.c | 4 +- + net/sched/sch_sfb.c | 24 +- + net/sched/sch_sfq.c | 27 +- + net/sctp/ipv6.c | 7 +- + net/sctp/protocol.c | 2 +- + net/socket.c | 7 +- + net/switchdev/switchdev.c | 829 ++- + net/tipc/addr.c | 7 - + net/tipc/addr.h | 8 + + net/tipc/bcast.c | 41 +- + net/tipc/bcast.h | 1 + + net/tipc/bearer.c | 20 +- + net/tipc/bearer.h | 2 +- + net/tipc/core.c | 4 +- + net/tipc/core.h | 37 +- + net/tipc/link.c | 311 +- + net/tipc/link.h | 59 +- + net/tipc/msg.c | 51 +- + net/tipc/msg.h | 37 +- + net/tipc/name_table.c | 34 +- + net/tipc/net.c | 1 + + net/tipc/netlink_compat.c | 137 +- + net/tipc/node.c | 3 +- + net/tipc/node.h | 2 - + net/tipc/server.c | 6 +- + net/tipc/socket.c | 10 +- + net/tipc/subscr.c | 242 +- + net/tipc/subscr.h | 18 +- + net/unix/af_unix.c | 247 +- + net/vmw_vsock/af_vsock.c | 7 +- + net/vmw_vsock/vmci_transport.c | 2 +- + net/wireless/chan.c | 65 +- + net/wireless/core.h | 1 + + net/wireless/nl80211.c | 7 +- + net/wireless/reg.c | 4 +- + net/wireless/sme.c | 4 +- + net/wireless/sysfs.c | 14 +- + net/wireless/util.c | 5 +- + net/x25/af_x25.c | 8 +- + net/xfrm/xfrm_input.c | 12 +- + net/xfrm/xfrm_output.c | 12 + + net/xfrm/xfrm_policy.c | 42 +- + net/xfrm/xfrm_state.c | 4 +- + samples/bpf/Makefile | 10 +- + samples/bpf/bpf_helpers.h | 4 + + samples/bpf/bpf_load.c | 57 +- + samples/bpf/sockex3_kern.c | 290 + + samples/bpf/sockex3_user.c | 66 + + samples/bpf/tcbpf1_kern.c | 8 +- + samples/bpf/test_verifier.c | 84 +- + samples/bpf/tracex5_kern.c | 75 + + samples/bpf/tracex5_user.c | 46 + + samples/pktgen/README.rst | 43 + + samples/pktgen/functions.sh | 121 + + samples/pktgen/parameters.sh | 97 + + samples/pktgen/pktgen.conf-1-1 | 59 - + samples/pktgen/pktgen.conf-2-1 | 66 - + samples/pktgen/pktgen.conf-2-2 | 73 - + .../pktgen/pktgen_bench_xmit_mode_netif_receive.sh | 86 + + samples/pktgen/pktgen_sample01_simple.sh | 71 + + samples/pktgen/pktgen_sample02_multiqueue.sh | 75 + + .../pktgen/pktgen_sample03_burst_single_flow.sh | 82 + + tools/testing/selftests/net/psock_fanout.c | 2 +- + 1043 files changed, 76619 insertions(+), 20693 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-drivers-janz-cmodio + create mode 100644 Documentation/ABI/testing/sysfs-class-net-janz-ican3 + delete mode 100644 Documentation/devicetree/bindings/net/amd-xgbe-phy.txt + create mode 100644 Documentation/devicetree/bindings/net/ipq806x-dwmac.txt + create mode 100644 Documentation/devicetree/bindings/net/nxp,lpc1850-dwmac.txt + create mode 100644 Documentation/devicetree/bindings/net/ti,dp83867.txt + create mode 100644 drivers/bluetooth/btrtl.c + create mode 100644 drivers/bluetooth/btrtl.h + create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c + create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h + create mode 100644 drivers/net/ethernet/cavium/Kconfig + create mode 100644 drivers/net/ethernet/cavium/Makefile + create mode 100644 drivers/net/ethernet/cavium/thunder/Makefile + create mode 100644 drivers/net/ethernet/cavium/thunder/nic.h + create mode 100644 drivers/net/ethernet/cavium/thunder/nic_main.c + create mode 100644 drivers/net/ethernet/cavium/thunder/nic_reg.h + create mode 100644 drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c + create mode 100644 drivers/net/ethernet/cavium/thunder/nicvf_main.c + create mode 100644 drivers/net/ethernet/cavium/thunder/nicvf_queues.c + create mode 100644 drivers/net/ethernet/cavium/thunder/nicvf_queues.h + create mode 100644 drivers/net/ethernet/cavium/thunder/q_struct.h + create mode 100644 drivers/net/ethernet/cavium/thunder/thunder_bgx.c + create mode 100644 drivers/net/ethernet/cavium/thunder/thunder_bgx.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_flow_table.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_main.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_rx.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_tx.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/flow_table.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/transobj.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/transobj.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/vport.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/wq.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/wq.h + create mode 100644 drivers/net/ethernet/sfc/ef10_sriov.c + create mode 100644 drivers/net/ethernet/sfc/ef10_sriov.h + create mode 100644 drivers/net/ethernet/sfc/siena_sriov.h + create mode 100644 drivers/net/ethernet/sfc/sriov.c + create mode 100644 drivers/net/ethernet/sfc/sriov.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c + create mode 100644 drivers/net/geneve.c + create mode 100644 drivers/net/ieee802154/at86rf230.h + create mode 100644 drivers/net/ieee802154/atusb.c + create mode 100644 drivers/net/ieee802154/atusb.h + delete mode 100644 drivers/net/phy/amd-xgbe-phy.c + create mode 100644 drivers/net/phy/dp83867.c + create mode 100644 drivers/net/wireless/ath/ath10k/p2p.c + create mode 100644 drivers/net/wireless/ath/ath10k/p2p.h + create mode 100644 drivers/net/wireless/ath/ath10k/wow.c + create mode 100644 drivers/net/wireless/ath/ath10k/wow.h + create mode 100644 drivers/net/wireless/ath/wil6210/pmc.c + create mode 100644 drivers/net/wireless/ath/wil6210/pmc.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans.c + create mode 100644 drivers/net/wireless/mediatek/Kconfig + create mode 100644 drivers/net/wireless/mediatek/Makefile + create mode 100644 drivers/net/wireless/mediatek/mt7601u/Kconfig + create mode 100644 drivers/net/wireless/mediatek/mt7601u/Makefile + create mode 100644 drivers/net/wireless/mediatek/mt7601u/core.c + create mode 100644 drivers/net/wireless/mediatek/mt7601u/debugfs.c + create mode 100644 drivers/net/wireless/mediatek/mt7601u/dma.c + create mode 100644 drivers/net/wireless/mediatek/mt7601u/dma.h + create mode 100644 drivers/net/wireless/mediatek/mt7601u/eeprom.c + create mode 100644 drivers/net/wireless/mediatek/mt7601u/eeprom.h + create mode 100644 drivers/net/wireless/mediatek/mt7601u/init.c + create mode 100644 drivers/net/wireless/mediatek/mt7601u/initvals.h + create mode 100644 drivers/net/wireless/mediatek/mt7601u/initvals_phy.h + create mode 100644 drivers/net/wireless/mediatek/mt7601u/mac.c + create mode 100644 drivers/net/wireless/mediatek/mt7601u/mac.h + create mode 100644 drivers/net/wireless/mediatek/mt7601u/main.c + create mode 100644 drivers/net/wireless/mediatek/mt7601u/mcu.c + create mode 100644 drivers/net/wireless/mediatek/mt7601u/mcu.h + create mode 100644 drivers/net/wireless/mediatek/mt7601u/mt7601u.h + create mode 100644 drivers/net/wireless/mediatek/mt7601u/phy.c + create mode 100644 drivers/net/wireless/mediatek/mt7601u/regs.h + create mode 100644 drivers/net/wireless/mediatek/mt7601u/trace.c + create mode 100644 drivers/net/wireless/mediatek/mt7601u/trace.h + create mode 100644 drivers/net/wireless/mediatek/mt7601u/tx.c + create mode 100644 drivers/net/wireless/mediatek/mt7601u/usb.c + create mode 100644 drivers/net/wireless/mediatek/mt7601u/usb.h + create mode 100644 drivers/net/wireless/mediatek/mt7601u/util.c + create mode 100644 drivers/net/wireless/mediatek/mt7601u/util.h + create mode 100644 include/dt-bindings/net/ti-dp83867.h + create mode 100644 include/linux/mlx5/flow_table.h + create mode 100644 include/linux/mlx5/vport.h + create mode 100644 include/linux/netfilter_ingress.h + create mode 100644 include/net/flow_dissector.h + delete mode 100644 include/net/flow_keys.h + rename net/ipv4/{geneve.c => geneve_core.c} (97%) + create mode 100644 net/ipv6/mcast_snoop.c + create mode 100644 net/netfilter/nf_tables_netdev.c + create mode 100644 net/sched/cls_flower.c + create mode 100644 samples/bpf/sockex3_kern.c + create mode 100644 samples/bpf/sockex3_user.c + create mode 100644 samples/bpf/tracex5_kern.c + create mode 100644 samples/bpf/tracex5_user.c + create mode 100644 samples/pktgen/README.rst + create mode 100644 samples/pktgen/functions.sh + create mode 100644 samples/pktgen/parameters.sh + delete mode 100755 samples/pktgen/pktgen.conf-1-1 + delete mode 100755 samples/pktgen/pktgen.conf-2-1 + delete mode 100755 samples/pktgen/pktgen.conf-2-2 + create mode 100755 samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh + create mode 100755 samples/pktgen/pktgen_sample01_simple.sh + create mode 100755 samples/pktgen/pktgen_sample02_multiqueue.sh + create mode 100755 samples/pktgen/pktgen_sample03_burst_single_flow.sh +Merging ipsec-next/master (493be55ac3d8 xen-netfront: Use setup_timer) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-drivers-next/master (49280625eb82 bcma: lower dependency of BCMA_DRIVER_PCI_HOSTMODE) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/bcma/Kconfig | 12 +- + drivers/net/wireless/ath/ath9k/main.c | 12 +- + drivers/net/wireless/b43/main.c | 4 + + drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 1 + + drivers/net/wireless/brcm80211/brcmfmac/firmware.c | 50 ++++---- + drivers/net/wireless/mediatek/mt7601u/dma.c | 74 ++++-------- + drivers/net/wireless/mediatek/mt7601u/init.c | 3 + + drivers/net/wireless/mediatek/mt7601u/mac.c | 8 +- + drivers/net/wireless/mediatek/mt7601u/main.c | 1 + + drivers/net/wireless/mediatek/mt7601u/usb.c | 9 +- + drivers/net/wireless/mwifiex/11h.c | 32 ++++- + drivers/net/wireless/mwifiex/11n.c | 11 +- + drivers/net/wireless/mwifiex/11n_rxreorder.c | 5 +- + drivers/net/wireless/mwifiex/cfg80211.c | 130 +++++++++++++++++++-- + drivers/net/wireless/mwifiex/cmdevt.c | 5 +- + drivers/net/wireless/mwifiex/fw.h | 43 ++++++- + drivers/net/wireless/mwifiex/ie.c | 102 +++++++++------- + drivers/net/wireless/mwifiex/ioctl.h | 1 + + drivers/net/wireless/mwifiex/join.c | 30 ++++- + drivers/net/wireless/mwifiex/main.h | 23 +++- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 26 +++++ + drivers/net/wireless/mwifiex/txrx.c | 21 +++- + drivers/net/wireless/mwifiex/uap_cmd.c | 57 ++++++++- + drivers/net/wireless/mwifiex/uap_event.c | 63 ++++++++++ + drivers/net/wireless/mwifiex/uap_txrx.c | 18 ++- + drivers/net/wireless/mwifiex/util.c | 56 ++++++--- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 8 +- + drivers/net/wireless/ti/wl1251/acx.c | 3 - + include/linux/bcma/bcma_driver_pci.h | 11 ++ + 29 files changed, 632 insertions(+), 187 deletions(-) +Merging bluetooth/master (d446278c408b nl802154: fix misspelled enum) +$ git merge bluetooth/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 ++ + drivers/bluetooth/ath3k.c | 4 + + drivers/bluetooth/btbcm.c | 130 +++++++++++++++--- + drivers/bluetooth/btbcm.h | 30 +++- + drivers/bluetooth/btusb.c | 104 +++++++------- + drivers/bluetooth/hci_bcm.c | 89 +++++++++++- + drivers/bluetooth/hci_bcsp.c | 16 +-- + drivers/bluetooth/hci_ldisc.c | 27 ++++ + drivers/bluetooth/hci_uart.h | 4 + + drivers/bluetooth/hci_vhci.c | 2 +- + drivers/net/ieee802154/at86rf230.c | 3 +- + drivers/net/ieee802154/atusb.c | 101 +++++++++++--- + drivers/net/ieee802154/cc2520.c | 151 ++++++++++++++++---- + drivers/net/ieee802154/mrf24j40.c | 10 +- + include/linux/ieee802154.h | 16 +-- + include/linux/spi/cc2520.h | 1 - + include/net/bluetooth/bluetooth.h | 11 ++ + include/net/bluetooth/hci_core.h | 18 ++- + include/net/mac802154.h | 136 ++++++++++++------- + include/net/nl802154.h | 6 +- + net/bluetooth/Makefile | 3 +- + net/bluetooth/hci_conn.c | 4 +- + net/bluetooth/hci_core.c | 1 + + net/bluetooth/hci_event.c | 3 +- + net/bluetooth/hci_sock.c | 30 ++-- + net/bluetooth/l2cap_core.c | 5 +- + net/bluetooth/mgmt.c | 7 +- + net/bluetooth/rfcomm/sock.c | 20 +-- + net/bluetooth/sco.c | 5 +- + net/bluetooth/smp.c | 24 ++-- + net/ieee802154/6lowpan/tx.c | 5 +- + net/ieee802154/nl802154.c | 40 ++++++ + net/ieee802154/socket.c | 6 + + net/ieee802154/trace.h | 10 +- + net/mac802154/Makefile | 4 +- + net/mac802154/driver-ops.h | 92 +++++++++++-- + net/mac802154/ieee802154_i.h | 2 - + net/mac802154/iface.c | 14 +- + net/mac802154/rx.c | 4 +- + net/mac802154/trace.c | 9 ++ + net/mac802154/trace.h | 272 +++++++++++++++++++++++++++++++++++++ + 41 files changed, 1157 insertions(+), 270 deletions(-) + create mode 100644 net/mac802154/trace.c + create mode 100644 net/mac802154/trace.h +Merging rdma/for-next (ec08a8158de2 Merge branch 'for-4.2-misc' into k.o/for-4.2) +$ git merge rdma/for-next +Auto-merging net/sunrpc/xprtrdma/svc_rdma_transport.c +Auto-merging net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +Auto-merging net/rds/rds.h +Auto-merging net/rds/af_rds.c +Auto-merging include/linux/mlx5/driver.h +Auto-merging drivers/infiniband/ulp/isert/ib_isert.c +Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_ah.c +Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/mlx5/mad.c +Auto-merging drivers/infiniband/hw/mlx4/mlx4_ib.h +Auto-merging drivers/infiniband/hw/mlx4/main.c +Auto-merging drivers/infiniband/hw/mlx4/mad.c +Auto-merging drivers/infiniband/hw/cxgb4/provider.c +Auto-merging drivers/infiniband/core/cma.c +Auto-merging drivers/infiniband/core/cm.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/addr.c | 4 +- + drivers/infiniband/core/agent.c | 10 +- + drivers/infiniband/core/agent.h | 4 +- + drivers/infiniband/core/cache.c | 69 +++--- + drivers/infiniband/core/cm.c | 20 +- + drivers/infiniband/core/cma.c | 287 +++++++++++------------ + drivers/infiniband/core/device.c | 81 +++---- + drivers/infiniband/core/mad.c | 102 ++++----- + drivers/infiniband/core/mad_priv.h | 4 +- + drivers/infiniband/core/multicast.c | 12 +- + drivers/infiniband/core/sa_query.c | 30 +-- + drivers/infiniband/core/smi.c | 4 +- + drivers/infiniband/core/sysfs.c | 1 + + drivers/infiniband/core/ucm.c | 3 +- + drivers/infiniband/core/ucma.c | 25 +- + drivers/infiniband/core/user_mad.c | 44 ++-- + drivers/infiniband/core/verbs.c | 80 ++++++- + drivers/infiniband/hw/amso1100/c2_provider.c | 24 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 24 +- + drivers/infiniband/hw/cxgb4/provider.c | 23 +- + drivers/infiniband/hw/ehca/ehca_iverbs.h | 7 +- + drivers/infiniband/hw/ehca/ehca_main.c | 18 ++ + drivers/infiniband/hw/ehca/ehca_sqp.c | 14 +- + drivers/infiniband/hw/ipath/ipath_mad.c | 8 +- + drivers/infiniband/hw/ipath/ipath_verbs.c | 18 ++ + drivers/infiniband/hw/ipath/ipath_verbs.h | 6 +- + drivers/infiniband/hw/mlx4/mad.c | 21 +- + drivers/infiniband/hw/mlx4/main.c | 27 ++- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 8 +- + drivers/infiniband/hw/mlx5/mad.c | 8 +- + drivers/infiniband/hw/mlx5/main.c | 18 ++ + drivers/infiniband/hw/mlx5/mlx5_ib.h | 8 +- + drivers/infiniband/hw/mthca/mthca_cmd.c | 4 +- + drivers/infiniband/hw/mthca/mthca_cmd.h | 4 +- + drivers/infiniband/hw/mthca/mthca_dev.h | 6 +- + drivers/infiniband/hw/mthca/mthca_mad.c | 10 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 18 ++ + drivers/infiniband/hw/nes/nes_cm.c | 7 + + drivers/infiniband/hw/nes/nes_cm.h | 2 + + drivers/infiniband/hw/nes/nes_verbs.c | 22 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 6 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 6 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 18 ++ + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 7 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 3 + + drivers/infiniband/hw/qib/qib_mad.c | 10 +- + drivers/infiniband/hw/qib/qib_verbs.c | 18 ++ + drivers/infiniband/hw/qib/qib_verbs.h | 4 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 17 ++ + drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 2 + + drivers/infiniband/ulp/ipoib/ipoib_main.c | 19 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 28 ++- + drivers/infiniband/ulp/isert/ib_isert.c | 19 +- + drivers/infiniband/ulp/srp/ib_srp.c | 137 +++++------ + drivers/infiniband/ulp/srp/ib_srp.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/mad.c | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 6 +- + drivers/scsi/scsi_transport_srp.c | 67 ++++-- + include/linux/mlx5/driver.h | 2 +- + include/rdma/ib_addr.h | 6 +- + include/rdma/ib_cache.h | 8 +- + include/rdma/ib_mad.h | 4 +- + include/rdma/ib_verbs.h | 316 +++++++++++++++++++++++++- + include/rdma/iw_cm.h | 1 + + include/rdma/rdma_cm.h | 2 + + include/scsi/srp.h | 7 +- + net/rds/af_rds.c | 9 - + net/rds/ib.h | 1 - + net/rds/ib_cm.c | 36 +-- + net/rds/ib_recv.c | 4 +- + net/rds/ib_send.c | 55 ++--- + net/rds/iw_send.c | 18 +- + net/rds/rdma_transport.c | 34 +-- + net/rds/rds.h | 3 +- + net/sunrpc/xprtrdma/frwr_ops.c | 4 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 4 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 74 +++--- + net/sunrpc/xprtrdma/verbs.c | 90 +------- + 78 files changed, 1267 insertions(+), 868 deletions(-) +Merging mtd/master (e26081808eda Linux 4.1-rc4) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (e5babdf928e5 mtd: dc21285: use raw spinlock functions for nw_gpio_lock) +$ git merge l2-mtd/master +Auto-merging fs/jffs2/fs.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 150 ++ + MAINTAINERS | 6 + + drivers/mtd/chips/Kconfig | 1 + + drivers/mtd/chips/cfi_cmdset_0002.c | 2 +- + drivers/mtd/chips/cfi_util.c | 188 ++ + drivers/mtd/devices/docg3.c | 2 +- + drivers/mtd/devices/m25p80.c | 60 +- + drivers/mtd/devices/spear_smi.c | 4 +- + drivers/mtd/maps/Kconfig | 2 +- + drivers/mtd/maps/amd76xrom.c | 2 +- + drivers/mtd/maps/dc21285.c | 4 +- + drivers/mtd/maps/esb2rom.c | 2 +- + drivers/mtd/maps/ichxrom.c | 2 +- + drivers/mtd/maps/lantiq-flash.c | 4 +- + drivers/mtd/maps/physmap_of.c | 4 +- + drivers/mtd/mtd_blkdevs.c | 7 +- + drivers/mtd/mtdcore.c | 44 +- + drivers/mtd/nand/Kconfig | 10 +- + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/brcmnand/Makefile | 6 + + drivers/mtd/nand/brcmnand/bcm63138_nand.c | 111 + + drivers/mtd/nand/brcmnand/brcmnand.c | 2246 ++++++++++++++++++++ + drivers/mtd/nand/brcmnand/brcmnand.h | 73 + + drivers/mtd/nand/brcmnand/brcmstb_nand.c | 44 + + drivers/mtd/nand/brcmnand/iproc_nand.c | 150 ++ + drivers/mtd/nand/diskonchip.c | 27 +- + drivers/mtd/nand/fsmc_nand.c | 8 +- + drivers/mtd/nand/mpc5121_nfc.c | 2 +- + drivers/mtd/nand/mxc_nand.c | 112 +- + drivers/mtd/nand/nand_base.c | 48 +- + drivers/mtd/nand/nand_bbt.c | 26 +- + drivers/mtd/nand/nand_ids.c | 2 - + drivers/mtd/nand/ndfc.c | 2 - + drivers/mtd/nand/plat_nand.c | 4 +- + drivers/mtd/nand/pxa3xx_nand.c | 43 +- + drivers/mtd/nand/s3c2410.c | 2 +- + drivers/mtd/nand/xway_nand.c | 4 - + drivers/mtd/onenand/samsung.c | 2 +- + drivers/mtd/spi-nor/fsl-quadspi.c | 2 +- + drivers/mtd/spi-nor/spi-nor.c | 18 +- + fs/jffs2/fs.c | 7 +- + fs/jffs2/readinode.c | 27 +- + include/linux/mtd/cfi.h | 188 +- + include/linux/mtd/nand.h | 6 +- + 44 files changed, 3282 insertions(+), 373 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt + create mode 100644 drivers/mtd/nand/brcmnand/Makefile + create mode 100644 drivers/mtd/nand/brcmnand/bcm63138_nand.c + create mode 100644 drivers/mtd/nand/brcmnand/brcmnand.c + create mode 100644 drivers/mtd/nand/brcmnand/brcmnand.h + create mode 100644 drivers/mtd/nand/brcmnand/brcmstb_nand.c + create mode 100644 drivers/mtd/nand/brcmnand/iproc_nand.c +Merging crypto/master (42ea507fae1a crypto: drbg - reseed often if seedsource is degraded) +$ git merge crypto/master +Resolved 'net/ipv4/esp4.c' using previous resolution. +Resolved 'net/ipv6/esp6.c' using previous resolution. +Auto-merging net/mac802154/llsec.c +Auto-merging net/key/af_key.c +Auto-merging net/ipv6/esp6.c +CONFLICT (content): Merge conflict in net/ipv6/esp6.c +Auto-merging net/ipv4/esp4.c +CONFLICT (content): Merge conflict in net/ipv4/esp4.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging drivers/crypto/n2_core.c +Removing crypto/krng.c +Auto-merging arch/powerpc/kernel/prom.c +Removing arch/arm/crypto/sha512_neon_glue.c +Removing arch/arm/crypto/sha512-armv7-neon.S +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f49f313a8461] Merge remote-tracking branch 'crypto/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/crypto-API.tmpl | 67 +- + .../devicetree/bindings/crypto/fsl-sec2.txt | 6 +- + MAINTAINERS | 5 +- + arch/arm/crypto/Kconfig | 15 +- + arch/arm/crypto/Makefile | 10 +- + arch/arm/crypto/aes-ce-core.S | 7 +- + arch/arm/crypto/sha512-armv4.pl | 649 +++++++ + arch/arm/crypto/sha512-armv7-neon.S | 455 ----- + arch/arm/crypto/sha512-core.S_shipped | 1861 ++++++++++++++++++++ + arch/arm/crypto/sha512-glue.c | 121 ++ + arch/arm/crypto/sha512-neon-glue.c | 98 ++ + arch/arm/crypto/sha512.h | 8 + + arch/arm/crypto/sha512_neon_glue.c | 305 ---- + arch/arm64/crypto/aes-ce-ccm-glue.c | 2 +- + arch/mips/cavium-octeon/crypto/octeon-md5.c | 8 +- + arch/nios2/kernel/time.c | 2 + + arch/powerpc/crypto/md5-glue.c | 8 +- + arch/powerpc/include/asm/icswx.h | 184 ++ + arch/powerpc/include/asm/ppc-opcode.h | 13 + + arch/powerpc/kernel/prom.c | 1 + + arch/sparc/crypto/md5_glue.c | 8 +- + arch/x86/crypto/aesni-intel_glue.c | 423 ++--- + arch/x86/crypto/sha-mb/sha1_mb.c | 3 +- + crypto/842.c | 174 +- + crypto/Kconfig | 85 +- + crypto/Makefile | 6 +- + crypto/ablkcipher.c | 10 +- + crypto/aead.c | 684 +++++-- + crypto/algapi.c | 31 +- + crypto/algif_aead.c | 67 +- + crypto/algif_rng.c | 2 +- + crypto/ansi_cprng.c | 88 +- + crypto/authenc.c | 17 +- + crypto/authencesn.c | 17 +- + crypto/blkcipher.c | 1 + + crypto/ccm.c | 14 +- + crypto/chacha20_generic.c | 216 +++ + crypto/chacha20poly1305.c | 687 ++++++++ + crypto/chainiv.c | 66 +- + crypto/cryptd.c | 135 +- + crypto/crypto_null.c | 39 + + crypto/drbg.c | 561 +++--- + crypto/echainiv.c | 328 ++++ + crypto/eseqiv.c | 29 +- + crypto/fips.c | 53 +- + crypto/gcm.c | 45 +- + crypto/internal.h | 3 +- + crypto/jitterentropy.c | 928 ++++++++++ + crypto/krng.c | 66 - + crypto/md5.c | 8 +- + crypto/pcompress.c | 7 +- + crypto/pcrypt.c | 199 +-- + crypto/poly1305_generic.c | 300 ++++ + crypto/proc.c | 41 - + crypto/rng.c | 105 +- + crypto/scatterwalk.c | 45 +- + crypto/seqiv.c | 571 +++++- + crypto/shash.c | 7 +- + crypto/tcrypt.c | 24 +- + crypto/testmgr.c | 156 +- + crypto/testmgr.h | 1403 ++++++++++++++- + crypto/zlib.c | 4 +- + drivers/char/random.c | 80 +- + drivers/crypto/Kconfig | 28 +- + drivers/crypto/caam/caamalg.c | 122 +- + drivers/crypto/caam/compat.h | 2 +- + drivers/crypto/caam/sg_sw_sec4.h | 15 + + drivers/crypto/ccp/ccp-ops.c | 9 +- + drivers/crypto/ccp/ccp-platform.c | 2 - + drivers/crypto/ixp4xx_crypto.c | 9 +- + drivers/crypto/mv_cesa.c | 15 +- + drivers/crypto/n2_core.c | 8 +- + drivers/crypto/nx/Kconfig | 55 +- + drivers/crypto/nx/Makefile | 9 +- + drivers/crypto/nx/nx-842-crypto.c | 579 ++++++ + drivers/crypto/nx/nx-842-platform.c | 84 + + drivers/crypto/nx/nx-842-powernv.c | 634 +++++++ + drivers/crypto/nx/nx-842-pseries.c | 1140 ++++++++++++ + drivers/crypto/nx/nx-842.c | 1607 +---------------- + drivers/crypto/nx/nx-842.h | 127 ++ + drivers/crypto/nx/nx-aes-gcm.c | 3 - + drivers/crypto/nx/nx-sha256.c | 84 +- + drivers/crypto/nx/nx-sha512.c | 85 +- + drivers/crypto/nx/nx.c | 69 +- + drivers/crypto/nx/nx.h | 2 - + drivers/crypto/omap-sham.c | 27 +- + drivers/crypto/picoxcell_crypto.c | 5 +- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 1 - + drivers/crypto/qat/qat_common/adf_cfg_user.h | 12 - + drivers/crypto/qat/qat_common/adf_common_drv.h | 7 + + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 1 + + drivers/crypto/qat/qat_common/qat_algs.c | 39 +- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 5 +- + drivers/crypto/talitos.c | 743 +++++--- + drivers/crypto/talitos.h | 153 +- + drivers/crypto/vmx/Makefile | 2 +- + drivers/crypto/vmx/vmx.c | 2 +- + include/crypto/aead.h | 533 +++++- + include/crypto/algapi.h | 35 +- + include/crypto/compress.h | 8 +- + include/crypto/cryptd.h | 1 + + include/crypto/drbg.h | 59 +- + include/crypto/hash.h | 2 +- + include/crypto/internal/aead.h | 95 +- + include/crypto/internal/geniv.h | 24 + + include/crypto/internal/rng.h | 12 +- + include/crypto/md5.h | 5 + + include/crypto/null.h | 3 + + include/crypto/rng.h | 100 +- + include/crypto/scatterwalk.h | 4 + + include/linux/crypto.h | 492 +----- + include/linux/module.h | 12 + + include/linux/nx842.h | 21 +- + include/linux/random.h | 9 + + include/linux/scatterlist.h | 1 + + include/linux/sw842.h | 12 + + include/net/xfrm.h | 3 + + lib/842/842.h | 127 ++ + lib/842/842_compress.c | 626 +++++++ + lib/842/842_debugfs.h | 52 + + lib/842/842_decompress.c | 405 +++++ + lib/842/Makefile | 2 + + lib/Kconfig | 6 + + lib/Makefile | 2 + + lib/scatterlist.c | 32 + + net/ipv4/esp4.c | 201 ++- + net/ipv6/esp6.c | 201 ++- + net/key/af_key.c | 1 + + net/mac80211/aes_ccm.c | 33 +- + net/mac80211/aes_gcm.c | 33 +- + net/mac80211/aes_gmac.c | 14 +- + net/mac802154/llsec.c | 44 +- + net/xfrm/xfrm_algo.c | 28 + + net/xfrm/xfrm_user.c | 40 +- + 134 files changed, 15228 insertions(+), 5296 deletions(-) + create mode 100644 arch/arm/crypto/sha512-armv4.pl + delete mode 100644 arch/arm/crypto/sha512-armv7-neon.S + create mode 100644 arch/arm/crypto/sha512-core.S_shipped + create mode 100644 arch/arm/crypto/sha512-glue.c + create mode 100644 arch/arm/crypto/sha512-neon-glue.c + create mode 100644 arch/arm/crypto/sha512.h + delete mode 100644 arch/arm/crypto/sha512_neon_glue.c + create mode 100644 arch/powerpc/include/asm/icswx.h + create mode 100644 crypto/chacha20_generic.c + create mode 100644 crypto/chacha20poly1305.c + create mode 100644 crypto/echainiv.c + create mode 100644 crypto/jitterentropy.c + delete mode 100644 crypto/krng.c + create mode 100644 crypto/poly1305_generic.c + create mode 100644 drivers/crypto/nx/nx-842-crypto.c + create mode 100644 drivers/crypto/nx/nx-842-platform.c + create mode 100644 drivers/crypto/nx/nx-842-powernv.c + create mode 100644 drivers/crypto/nx/nx-842-pseries.c + create mode 100644 drivers/crypto/nx/nx-842.h + create mode 100644 include/crypto/internal/geniv.h + create mode 100644 include/linux/sw842.h + create mode 100644 lib/842/842.h + create mode 100644 lib/842/842_compress.c + create mode 100644 lib/842/842_debugfs.h + create mode 100644 lib/842/842_decompress.c + create mode 100644 lib/842/Makefile +Merging drm/drm-next (ae45577324d1 virtgpu: include linux/types.h to avoid warning.) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/i915/intel_ringbuffer.c' using previous resolution. +Auto-merging drivers/media/platform/Kconfig +Auto-merging drivers/iommu/Kconfig +Removing drivers/gpu/drm/tilcdc/tilcdc_slave.c +Auto-merging drivers/gpu/drm/tilcdc/tilcdc_external.h +Auto-merging drivers/gpu/drm/i915/intel_sdvo.c +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_i2c.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/drm_sysfs.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/drm/tilcdc/slave.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0dbc82042215] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/drm.tmpl | 23 +- + .../devicetree/bindings/drm/tilcdc/slave.txt | 18 - + .../devicetree/bindings/drm/tilcdc/tilcdc.txt | 27 + + MAINTAINERS | 11 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/gpu/drm/Kconfig | 23 + + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 17 + + drivers/gpu/drm/amd/amdgpu/Makefile | 81 + + drivers/gpu/drm/amd/amdgpu/ObjectID.h | 736 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2332 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 768 + + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.h | 445 + + drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c | 105 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 1598 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 206 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 572 + + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 221 + + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 363 + + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 268 + + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 1907 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.h | 42 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 784 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 193 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2003 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 832 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 955 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 85 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 545 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.h | 48 + + drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 245 + + drivers/gpu/drm/amd/amdgpu/amdgpu_family.h | 62 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 421 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 1127 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 371 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 72 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 737 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 72 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 395 + + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.h | 44 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 353 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 216 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 62 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ioc32.c | 47 + + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 458 + + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 92 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 697 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 322 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 586 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 671 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 203 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c | 350 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pll.h | 38 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 799 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 35 + + drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 125 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 561 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 419 + + drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c | 102 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 234 + + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 552 + + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 208 + + drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1215 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 317 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 176 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 984 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 39 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 724 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 47 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1265 + + drivers/gpu/drm/amd/amdgpu/atom-bits.h | 48 + + drivers/gpu/drm/amd/amdgpu/atom-names.h | 100 + + drivers/gpu/drm/amd/amdgpu/atom-types.h | 42 + + drivers/gpu/drm/amd/amdgpu/atom.c | 1408 + + drivers/gpu/drm/amd/amdgpu/atom.h | 159 + + drivers/gpu/drm/amd/amdgpu/atombios.h | 8555 +++++ + drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 807 + + drivers/gpu/drm/amd/amdgpu/atombios_crtc.h | 58 + + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 775 + + drivers/gpu/drm/amd/amdgpu/atombios_dp.h | 42 + + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 2066 ++ + drivers/gpu/drm/amd/amdgpu/atombios_encoders.h | 73 + + drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 158 + + drivers/gpu/drm/amd/amdgpu/atombios_i2c.h | 31 + + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6699 ++++ + drivers/gpu/drm/amd/amdgpu/ci_dpm.h | 348 + + drivers/gpu/drm/amd/amdgpu/ci_smc.c | 279 + + drivers/gpu/drm/amd/amdgpu/cik.c | 2513 ++ + drivers/gpu/drm/amd/amdgpu/cik.h | 33 + + drivers/gpu/drm/amd/amdgpu/cik_dpm.h | 30 + + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 471 + + drivers/gpu/drm/amd/amdgpu/cik_ih.h | 29 + + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 1405 + + drivers/gpu/drm/amd/amdgpu/cik_sdma.h | 29 + + drivers/gpu/drm/amd/amdgpu/cikd.h | 555 + + drivers/gpu/drm/amd/amdgpu/clearstate_ci.h | 944 + + drivers/gpu/drm/amd/amdgpu/clearstate_defs.h | 44 + + drivers/gpu/drm/amd/amdgpu/clearstate_vi.h | 944 + + drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 1814 + + drivers/gpu/drm/amd/amdgpu/cz_dpm.h | 237 + + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 452 + + drivers/gpu/drm/amd/amdgpu/cz_ih.h | 29 + + drivers/gpu/drm/amd/amdgpu/cz_ppsmc.h | 185 + + drivers/gpu/drm/amd/amdgpu/cz_smc.c | 962 + + drivers/gpu/drm/amd/amdgpu/cz_smumgr.h | 94 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 3811 +++ + drivers/gpu/drm/amd/amdgpu/dce_v10_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 3810 +++ + drivers/gpu/drm/amd/amdgpu/dce_v11_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 3771 +++ + drivers/gpu/drm/amd/amdgpu/dce_v8_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 5638 ++++ + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h | 37 + + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4283 +++ + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h | 33 + + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1339 + + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.h | 36 + + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1301 + + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.h | 36 + + drivers/gpu/drm/amd/amdgpu/iceland_dpm.c | 182 + + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 450 + + drivers/gpu/drm/amd/amdgpu/iceland_ih.h | 29 + + drivers/gpu/drm/amd/amdgpu/iceland_sdma_pkt_open.h | 2167 ++ + drivers/gpu/drm/amd/amdgpu/iceland_smc.c | 675 + + drivers/gpu/drm/amd/amdgpu/iceland_smumgr.h | 41 + + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 3343 ++ + drivers/gpu/drm/amd/amdgpu/kv_dpm.h | 229 + + drivers/gpu/drm/amd/amdgpu/kv_smc.c | 219 + + drivers/gpu/drm/amd/amdgpu/ppsmc.h | 196 + + drivers/gpu/drm/amd/amdgpu/pptable.h | 698 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 1416 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.h | 29 + + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 1482 + + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/smu7.h | 170 + + drivers/gpu/drm/amd/amdgpu/smu7_discrete.h | 514 + + drivers/gpu/drm/amd/amdgpu/smu7_fusion.h | 300 + + drivers/gpu/drm/amd/amdgpu/smu8.h | 72 + + drivers/gpu/drm/amd/amdgpu/smu8_fusion.h | 127 + + drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_cz.h | 147 + + drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_vi.h | 100 + + drivers/gpu/drm/amd/amdgpu/tonga_dpm.c | 181 + + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 473 + + drivers/gpu/drm/amd/amdgpu/tonga_ih.h | 29 + + drivers/gpu/drm/amd/amdgpu/tonga_ppsmc.h | 198 + + drivers/gpu/drm/amd/amdgpu/tonga_sdma_pkt_open.h | 2240 ++ + drivers/gpu/drm/amd/amdgpu/tonga_smc.c | 852 + + drivers/gpu/drm/amd/amdgpu/tonga_smumgr.h | 42 + + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 905 + + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.h | 29 + + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 844 + + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 824 + + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 663 + + drivers/gpu/drm/amd/amdgpu/vce_v2_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 573 + + drivers/gpu/drm/amd/amdgpu/vce_v3_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/vi.c | 1381 + + drivers/gpu/drm/amd/amdgpu/vi.h | 33 + + drivers/gpu/drm/amd/amdgpu/vi_dpm.h | 36 + + drivers/gpu/drm/amd/amdgpu/vid.h | 368 + + drivers/gpu/drm/amd/amdkfd/Makefile | 2 + + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 66 + + drivers/gpu/drm/amd/amdkfd/cik_int.h | 41 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 395 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 886 + + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h | 193 + + drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c | 168 + + drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h | 294 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 57 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 81 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 27 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 18 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 15 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 965 + + drivers/gpu/drm/amd/amdkfd/kfd_events.h | 84 + + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 188 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 46 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers.h | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_diq.h | 290 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 99 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 38 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 18 +- + drivers/gpu/drm/amd/include/amd_shared.h | 81 + + .../gpu/drm/amd/include/asic_reg/bif/bif_4_1_d.h | 921 + + .../drm/amd/include/asic_reg/bif/bif_4_1_sh_mask.h | 10250 ++++++ + .../gpu/drm/amd/include/asic_reg/bif/bif_5_0_d.h | 1068 + + .../drm/amd/include/asic_reg/bif/bif_5_0_enum.h | 1198 + + .../drm/amd/include/asic_reg/bif/bif_5_0_sh_mask.h | 11494 +++++++ + .../gpu/drm/amd/include/asic_reg/bif/bif_5_1_d.h | 3577 ++ + .../drm/amd/include/asic_reg/bif/bif_5_1_enum.h | 1068 + + .../drm/amd/include/asic_reg/bif/bif_5_1_sh_mask.h | 33080 +++++++++++++++++++ + .../gpu/drm/amd/include/asic_reg/dce/dce_10_0_d.h | 7350 ++++ + .../drm/amd/include/asic_reg/dce/dce_10_0_enum.h | 1773 + + .../amd/include/asic_reg/dce/dce_10_0_sh_mask.h | 16647 ++++++++++ + .../gpu/drm/amd/include/asic_reg/dce/dce_11_0_d.h | 7648 +++++ + .../drm/amd/include/asic_reg/dce/dce_11_0_enum.h | 6129 ++++ + .../amd/include/asic_reg/dce/dce_11_0_sh_mask.h | 17557 ++++++++++ + .../gpu/drm/amd/include/asic_reg/dce/dce_8_0_d.h | 5703 ++++ + .../drm/amd/include/asic_reg/dce/dce_8_0_sh_mask.h | 13109 ++++++++ + .../gpu/drm/amd/include/asic_reg/gca/gfx_7_0_d.h | 2532 ++ + .../gpu/drm/amd/include/asic_reg/gca/gfx_7_2_d.h | 2557 ++ + .../drm/amd/include/asic_reg/gca/gfx_7_2_enum.h | 6274 ++++ + .../drm/amd/include/asic_reg/gca/gfx_7_2_sh_mask.h | 18444 +++++++++++ + .../gpu/drm/amd/include/asic_reg/gca/gfx_8_0_d.h | 2811 ++ + .../drm/amd/include/asic_reg/gca/gfx_8_0_enum.h | 6858 ++++ + .../drm/amd/include/asic_reg/gca/gfx_8_0_sh_mask.h | 20776 ++++++++++++ + .../gpu/drm/amd/include/asic_reg/gmc/gmc_7_0_d.h | 657 + + .../drm/amd/include/asic_reg/gmc/gmc_7_0_sh_mask.h | 6116 ++++ + .../gpu/drm/amd/include/asic_reg/gmc/gmc_7_1_d.h | 1464 + + .../drm/amd/include/asic_reg/gmc/gmc_7_1_sh_mask.h | 14416 ++++++++ + .../gpu/drm/amd/include/asic_reg/gmc/gmc_8_1_d.h | 1708 + + .../drm/amd/include/asic_reg/gmc/gmc_8_1_enum.h | 1198 + + .../drm/amd/include/asic_reg/gmc/gmc_8_1_sh_mask.h | 15682 +++++++++ + .../gpu/drm/amd/include/asic_reg/gmc/gmc_8_2_d.h | 910 + + .../drm/amd/include/asic_reg/gmc/gmc_8_2_enum.h | 1068 + + .../drm/amd/include/asic_reg/gmc/gmc_8_2_sh_mask.h | 7850 +++++ + .../gpu/drm/amd/include/asic_reg/oss/oss_2_0_d.h | 642 + + .../drm/amd/include/asic_reg/oss/oss_2_0_sh_mask.h | 2476 ++ + .../gpu/drm/amd/include/asic_reg/oss/oss_2_4_d.h | 471 + + .../drm/amd/include/asic_reg/oss/oss_2_4_enum.h | 1340 + + .../drm/amd/include/asic_reg/oss/oss_2_4_sh_mask.h | 2544 ++ + .../gpu/drm/amd/include/asic_reg/oss/oss_3_0_1_d.h | 593 + + .../drm/amd/include/asic_reg/oss/oss_3_0_1_enum.h | 1464 + + .../amd/include/asic_reg/oss/oss_3_0_1_sh_mask.h | 3558 ++ + .../gpu/drm/amd/include/asic_reg/oss/oss_3_0_d.h | 688 + + .../drm/amd/include/asic_reg/oss/oss_3_0_enum.h | 1497 + + .../drm/amd/include/asic_reg/oss/oss_3_0_sh_mask.h | 3660 ++ + .../gpu/drm/amd/include/asic_reg/smu/smu_7_0_0_d.h | 741 + + .../amd/include/asic_reg/smu/smu_7_0_0_sh_mask.h | 3842 +++ + .../gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_d.h | 1314 + + .../amd/include/asic_reg/smu/smu_7_0_1_sh_mask.h | 5456 +++ + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_0_d.h | 1344 + + .../drm/amd/include/asic_reg/smu/smu_7_1_0_enum.h | 1191 + + .../amd/include/asic_reg/smu/smu_7_1_0_sh_mask.h | 5648 ++++ + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_1_d.h | 1123 + + .../drm/amd/include/asic_reg/smu/smu_7_1_1_enum.h | 1205 + + .../amd/include/asic_reg/smu/smu_7_1_1_sh_mask.h | 4864 +++ + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_d.h | 1273 + + .../drm/amd/include/asic_reg/smu/smu_7_1_2_enum.h | 1246 + + .../amd/include/asic_reg/smu/smu_7_1_2_sh_mask.h | 5834 ++++ + .../gpu/drm/amd/include/asic_reg/smu/smu_8_0_d.h | 671 + + .../drm/amd/include/asic_reg/smu/smu_8_0_enum.h | 1072 + + .../drm/amd/include/asic_reg/smu/smu_8_0_sh_mask.h | 2964 ++ + .../gpu/drm/amd/include/asic_reg/uvd/uvd_4_2_d.h | 95 + + .../drm/amd/include/asic_reg/uvd/uvd_4_2_sh_mask.h | 800 + + .../gpu/drm/amd/include/asic_reg/uvd/uvd_5_0_d.h | 114 + + .../drm/amd/include/asic_reg/uvd/uvd_5_0_enum.h | 1211 + + .../drm/amd/include/asic_reg/uvd/uvd_5_0_sh_mask.h | 1046 + + .../gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h | 115 + + .../drm/amd/include/asic_reg/uvd/uvd_6_0_enum.h | 1081 + + .../drm/amd/include/asic_reg/uvd/uvd_6_0_sh_mask.h | 1034 + + .../gpu/drm/amd/include/asic_reg/vce/vce_2_0_d.h | 68 + + .../drm/amd/include/asic_reg/vce/vce_2_0_sh_mask.h | 104 + + .../gpu/drm/amd/include/asic_reg/vce/vce_3_0_d.h | 73 + + .../drm/amd/include/asic_reg/vce/vce_3_0_sh_mask.h | 120 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 23 + + drivers/gpu/drm/armada/armada_drm.h | 2 - + drivers/gpu/drm/armada/armada_drv.c | 10 - + drivers/gpu/drm/armada/armada_output.c | 16 - + drivers/gpu/drm/armada/armada_output.h | 6 - + drivers/gpu/drm/drm_atomic.c | 296 +- + drivers/gpu/drm/drm_atomic_helper.c | 162 +- + drivers/gpu/drm/drm_auth.c | 178 +- + drivers/gpu/drm/drm_bridge.c | 242 + + drivers/gpu/drm/drm_crtc.c | 634 +- + drivers/gpu/drm/drm_crtc_helper.c | 96 +- + drivers/gpu/drm/drm_dp_helper.c | 12 +- + drivers/gpu/drm/drm_drv.c | 20 +- + drivers/gpu/drm/drm_edid.c | 238 +- + drivers/gpu/drm/drm_edid_load.c | 7 +- + drivers/gpu/drm/drm_flip_work.c | 4 +- + drivers/gpu/drm/drm_fops.c | 12 +- + drivers/gpu/drm/drm_internal.h | 1 - + drivers/gpu/drm/drm_ioctl.c | 2 + + drivers/gpu/drm/drm_irq.c | 109 +- + drivers/gpu/drm/drm_mm.c | 4 +- + drivers/gpu/drm/drm_modes.c | 87 + + drivers/gpu/drm/drm_modeset_lock.c | 8 +- + drivers/gpu/drm/drm_prime.c | 6 +- + drivers/gpu/drm/drm_probe_helper.c | 4 +- + drivers/gpu/drm/drm_sysfs.c | 160 +- + drivers/gpu/drm/i2c/adv7511.c | 2 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 27 +- + drivers/gpu/drm/i915/Makefile | 5 +- + drivers/gpu/drm/i915/dvo_ivch.c | 21 +- + drivers/gpu/drm/i915/dvo_ns2501.c | 670 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 12 +- + drivers/gpu/drm/i915/i915_debugfs.c | 733 +- + drivers/gpu/drm/i915/i915_dma.c | 283 +- + drivers/gpu/drm/i915/i915_drv.c | 120 +- + drivers/gpu/drm/i915/i915_drv.h | 291 +- + drivers/gpu/drm/i915/i915_gem.c | 989 +- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 84 +- + drivers/gpu/drm/i915/i915_gem_batch_pool.h | 42 + + drivers/gpu/drm/i915/i915_gem_context.c | 39 +- + drivers/gpu/drm/i915/i915_gem_debug.c | 92 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 90 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 1118 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 121 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 8 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 15 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 30 +- + drivers/gpu/drm/i915/i915_irq.c | 329 +- + drivers/gpu/drm/i915/i915_params.c | 8 + + drivers/gpu/drm/i915/i915_reg.h | 610 +- + drivers/gpu/drm/i915/i915_trace.h | 44 +- + drivers/gpu/drm/i915/intel_atomic.c | 184 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 48 +- + drivers/gpu/drm/i915/intel_audio.c | 24 +- + drivers/gpu/drm/i915/intel_bios.c | 183 +- + drivers/gpu/drm/i915/intel_bios.h | 4 +- + drivers/gpu/drm/i915/intel_crt.c | 17 +- + drivers/gpu/drm/i915/intel_csr.c | 467 + + drivers/gpu/drm/i915/intel_ddi.c | 912 +- + drivers/gpu/drm/i915/intel_display.c | 3435 +- + drivers/gpu/drm/i915/intel_dp.c | 593 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 27 +- + drivers/gpu/drm/i915/intel_drv.h | 156 +- + drivers/gpu/drm/i915/intel_dsi.c | 8 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 4 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 80 +- + drivers/gpu/drm/i915/intel_dvo.c | 27 +- + drivers/gpu/drm/i915/intel_fbc.c | 2 +- + drivers/gpu/drm/i915/intel_fbdev.c | 28 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 2 + + drivers/gpu/drm/i915/intel_hdmi.c | 192 +- + drivers/gpu/drm/i915/intel_i2c.c | 118 +- + drivers/gpu/drm/i915/intel_lrc.c | 523 +- + drivers/gpu/drm/i915/intel_lrc.h | 5 +- + drivers/gpu/drm/i915/intel_lvds.c | 4 +- + drivers/gpu/drm/i915/intel_overlay.c | 68 +- + drivers/gpu/drm/i915/intel_panel.c | 87 +- + drivers/gpu/drm/i915/intel_pm.c | 354 +- + drivers/gpu/drm/i915/intel_psr.c | 118 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 196 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 10 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 476 +- + drivers/gpu/drm/i915/intel_sdvo.c | 85 +- + drivers/gpu/drm/i915/intel_sideband.c | 18 +- + drivers/gpu/drm/i915/intel_sprite.c | 374 +- + drivers/gpu/drm/i915/intel_uncore.c | 98 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 11 +- + drivers/gpu/drm/qxl/qxl_display.c | 2 +- + drivers/gpu/drm/qxl/qxl_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_drv.h | 2 +- + drivers/gpu/drm/qxl/qxl_fb.c | 275 +- + drivers/gpu/drm/qxl/qxl_gem.c | 10 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 46 +- + drivers/gpu/drm/qxl/qxl_object.c | 11 +- + drivers/gpu/drm/qxl/qxl_release.c | 13 +- + drivers/gpu/drm/radeon/atombios_dp.c | 8 +- + drivers/gpu/drm/radeon/cik.c | 25 + + drivers/gpu/drm/radeon/cik_reg.h | 58 +- + drivers/gpu/drm/radeon/cikd.h | 10 +- + drivers/gpu/drm/radeon/evergreen.c | 69 + + drivers/gpu/drm/radeon/ni.c | 102 + + drivers/gpu/drm/radeon/nid.h | 7 + + drivers/gpu/drm/radeon/r100.c | 22 + + drivers/gpu/drm/radeon/r300.c | 25 + + drivers/gpu/drm/radeon/r600.c | 47 + + drivers/gpu/drm/radeon/radeon.h | 242 +- + drivers/gpu/drm/radeon/radeon_asic.c | 21 + + drivers/gpu/drm/radeon/radeon_asic.h | 6 + + drivers/gpu/drm/radeon/radeon_audio.c | 18 +- + drivers/gpu/drm/radeon/radeon_audio.h | 2 - + drivers/gpu/drm/radeon/radeon_device.c | 2 + + drivers/gpu/drm/radeon/radeon_drv.c | 3 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 10 +- + drivers/gpu/drm/radeon/radeon_kfd.c | 172 +- + drivers/gpu/drm/radeon/radeon_kms.c | 3 + + drivers/gpu/drm/radeon/radeon_mode.h | 2 +- + drivers/gpu/drm/radeon/radeon_vce.c | 28 +- + drivers/gpu/drm/radeon/radeon_vm.c | 53 +- + drivers/gpu/drm/radeon/si.c | 167 + + drivers/gpu/drm/radeon/si_dpm.c | 109 +- + drivers/gpu/drm/radeon/sid.h | 29 + + drivers/gpu/drm/radeon/trinity_dpm.c | 83 + + drivers/gpu/drm/radeon/vce_v1_0.c | 197 + + drivers/gpu/drm/radeon/vce_v2_0.c | 16 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 61 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 14 + + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 6 + + drivers/gpu/drm/rcar-du/rcar_du_group.c | 6 + + drivers/gpu/drm/rcar-du/rcar_du_group.h | 8 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 105 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 71 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 21 +- + drivers/gpu/drm/tilcdc/Kconfig | 12 + + drivers/gpu/drm/tilcdc/Makefile | 5 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 36 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 99 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 6 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 166 + + .../tilcdc/{tilcdc_slave.h => tilcdc_external.h} | 17 +- + drivers/gpu/drm/tilcdc/tilcdc_slave.c | 411 - + drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c | 270 + + drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dts | 72 + + drivers/gpu/drm/tilcdc/tilcdc_slave_compat.h | 25 + + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 9 +- + drivers/gpu/drm/virtio/Kconfig | 14 + + drivers/gpu/drm/virtio/Makefile | 11 + + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 64 + + drivers/gpu/drm/virtio/virtgpu_display.c | 473 + + drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 91 + + drivers/gpu/drm/virtio/virtgpu_drv.c | 136 + + drivers/gpu/drm/virtio/virtgpu_drv.h | 350 + + drivers/gpu/drm/virtio/virtgpu_fb.c | 431 + + drivers/gpu/drm/virtio/virtgpu_fence.c | 119 + + drivers/gpu/drm/virtio/virtgpu_gem.c | 140 + + drivers/gpu/drm/virtio/virtgpu_kms.c | 173 + + drivers/gpu/drm/virtio/virtgpu_object.c | 170 + + drivers/gpu/drm/virtio/virtgpu_plane.c | 120 + + drivers/gpu/drm/virtio/virtgpu_ttm.c | 469 + + drivers/gpu/drm/virtio/virtgpu_vq.c | 614 + + drivers/iommu/Kconfig | 3 + + drivers/media/platform/Kconfig | 2 +- + include/drm/drmP.h | 19 +- + include/drm/drm_atomic.h | 89 +- + include/drm/drm_atomic_helper.h | 5 + + include/drm/drm_crtc.h | 63 +- + include/drm/drm_dp_helper.h | 6 +- + include/drm/drm_modes.h | 4 + + include/drm/i915_pciids.h | 4 + + include/uapi/drm/amdgpu_drm.h | 613 + + include/uapi/drm/drm.h | 2 + + include/uapi/drm/drm_mode.h | 20 + + include/uapi/drm/i915_drm.h | 9 +- + include/uapi/drm/radeon_drm.h | 1 + + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/kfd_ioctl.h | 135 +- + include/uapi/linux/virtio_gpu.h | 206 + + include/uapi/linux/virtio_ids.h | 1 + + 441 files changed, 446455 insertions(+), 6740 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/drm/tilcdc/slave.txt + create mode 100644 drivers/gpu/drm/amd/amdgpu/Kconfig + create mode 100644 drivers/gpu/drm/amd/amdgpu/Makefile + create mode 100644 drivers/gpu/drm/amd/amdgpu/ObjectID.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_family.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ioc32.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_object.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_pll.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_test.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/atom-bits.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/atom-names.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/atom-types.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/atom.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/atom.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/atombios.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/atombios_crtc.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/atombios_crtc.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/atombios_dp.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/atombios_dp.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/atombios_encoders.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/atombios_encoders.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/atombios_i2c.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/atombios_i2c.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/ci_dpm.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/ci_dpm.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/ci_smc.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/cik.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/cik.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/cik_dpm.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/cik_ih.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/cik_ih.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/cik_sdma.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/cik_sdma.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/cikd.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/clearstate_ci.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/clearstate_defs.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/clearstate_vi.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/cz_dpm.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/cz_dpm.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/cz_ih.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/cz_ih.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/cz_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/cz_smc.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/cz_smumgr.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_v10_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_v11_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/dce_v8_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/iceland_dpm.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/iceland_ih.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/iceland_ih.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/iceland_sdma_pkt_open.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/iceland_smc.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/iceland_smumgr.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/kv_dpm.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/kv_dpm.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/kv_smc.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/ppsmc.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/pptable.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smu7.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smu7_discrete.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smu7_fusion.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smu8.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smu8_fusion.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_cz.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_vi.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/tonga_dpm.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/tonga_ih.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/tonga_ih.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/tonga_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/tonga_sdma_pkt_open.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/tonga_smc.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/tonga_smumgr.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v4_2.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v5_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vce_v2_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vce_v2_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vce_v3_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vi.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vi.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vi_dpm.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vid.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/cik_int.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_events.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_events.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_diq.h + create mode 100644 drivers/gpu/drm/amd/include/amd_shared.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/bif/bif_4_1_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/bif/bif_4_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/bif/bif_5_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/bif/bif_5_0_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/bif/bif_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/bif/bif_5_1_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/bif/bif_5_1_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/bif/bif_5_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dce/dce_10_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dce/dce_10_0_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dce/dce_10_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_0_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dce/dce_8_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dce/dce_8_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gca/gfx_7_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gca/gfx_7_2_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gca/gfx_7_2_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gca/gfx_7_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_7_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_7_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_7_1_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_7_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_8_1_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_8_1_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_8_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_8_2_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_8_2_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_8_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/oss_2_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/oss_2_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/oss_2_4_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/oss_2_4_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/oss_2_4_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/oss_3_0_1_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/oss_3_0_1_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/oss_3_0_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/oss_3_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/oss_3_0_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/oss_3_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_0_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_0_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_1_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_1_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_8_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_8_0_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_8_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_2_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_5_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_5_0_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vce/vce_2_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vce/vce_2_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vce/vce_3_0_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vce/vce_3_0_sh_mask.h + create mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.h + create mode 100644 drivers/gpu/drm/i915/intel_csr.c + create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_external.c + rename drivers/gpu/drm/tilcdc/{tilcdc_slave.h => tilcdc_external.h} (63%) + delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave.c + create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c + create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dts + create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave_compat.h + create mode 100644 drivers/gpu/drm/virtio/Kconfig + create mode 100644 drivers/gpu/drm/virtio/Makefile + create mode 100644 drivers/gpu/drm/virtio/virtgpu_debugfs.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_display.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_drm_bus.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_drv.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_drv.h + create mode 100644 drivers/gpu/drm/virtio/virtgpu_fb.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_fence.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_gem.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_kms.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_object.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_plane.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_ttm.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_vq.c + create mode 100644 include/uapi/drm/amdgpu_drm.h + create mode 100644 include/uapi/linux/virtio_gpu.h +$ git am -3 ../patches/0001-drm-amdgpu-fix-the-build-on-big-endian.patch +Applying: drm/amdgpu: fix the build on big endian +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/amdgpu/cik_sdma.c +M drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +$ git add -A . +$ git commit -v -a --amend +[master 8e92254bd2ff] Merge remote-tracking branch 'drm/drm-next' + Date: Thu Jun 11 13:00:20 2015 +1000 +Merging drm-panel/drm/panel/for-next (7351148e2f36 drm/panel: simple: Add bus format for HannStar HSD100PXN1) +$ git merge drm-panel/drm/panel/for-next +Removing include/drm/bridge/ptn3460.h +Auto-merging drivers/gpu/drm/exynos/exynos_dp_core.c +Merge made by the 'recursive' strategy. + .../bindings/panel/hannstar,hsd100pxn1.txt | 7 +++ + .../devicetree/bindings/panel/lg,lb070wv8.txt | 7 +++ + drivers/gpu/drm/bridge/dw_hdmi.c | 6 +-- + drivers/gpu/drm/bridge/ps8622.c | 21 +++------ + drivers/gpu/drm/bridge/ptn3460.c | 28 ++++------- + drivers/gpu/drm/exynos/exynos_dp_core.c | 1 - + drivers/gpu/drm/panel/panel-ld9040.c | 10 ++-- + drivers/gpu/drm/panel/panel-s6e8aa0.c | 2 +- + drivers/gpu/drm/panel/panel-simple.c | 54 ++++++++++++++++++++++ + include/drm/bridge/ptn3460.h | 45 ------------------ + 10 files changed, 92 insertions(+), 89 deletions(-) + create mode 100644 Documentation/devicetree/bindings/panel/hannstar,hsd100pxn1.txt + create mode 100644 Documentation/devicetree/bindings/panel/lg,lb070wv8.txt + delete mode 100644 include/drm/bridge/ptn3460.h +Merging drm-intel/for-linux-next (bf546f8158e2 drm/i915/skl: Fix DMC API version in firmware file name) +$ git merge drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_csr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging drm-tegra/drm/tegra/for-next (535a65db484f drm/tegra: sor: Reset during initialization) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (0f5c41dbe96a Documentation/drm: Update rotation property) +$ git merge drm-misc/topic/drm-misc +Auto-merging Documentation/DocBook/drm.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 41 ++++++++++++++++++----------------------- + 1 file changed, 18 insertions(+), 23 deletions(-) +Merging drm-exynos/exynos-drm/for-next (7abddcd65bc0 drm/exynos: split exynos_crtc->dpms in enable() and disable()) +$ git merge drm-exynos/exynos-drm/for-next +Auto-merging drivers/gpu/drm/exynos/exynos_dp_core.c +Auto-merging drivers/gpu/drm/bridge/ptn3460.c +Auto-merging drivers/gpu/drm/bridge/ps8622.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/bridge/ps8622.c | 6 +- + drivers/gpu/drm/bridge/ptn3460.c | 6 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 91 +++---------- + drivers/gpu/drm/exynos/exynos_dp_core.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 201 ++++++---------------------- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 + + drivers/gpu/drm/exynos/exynos_drm_drv.h | 10 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_encoder.c | 35 +---- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 41 ++++++ + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 3 - + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 71 +++------- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 137 ++++++++++--------- + drivers/gpu/drm/exynos/exynos_drm_plane.h | 11 -- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 59 ++++---- + drivers/gpu/drm/exynos/exynos_hdmi.c | 10 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 26 +--- + 18 files changed, 269 insertions(+), 458 deletions(-) +Merging drm-msm/msm-next (d22855673f2e drm/msm: restart queued submits after hang) +$ git merge drm-msm/msm-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/drm/msm/dsi.txt | 120 ++++ + Documentation/devicetree/bindings/drm/msm/edp.txt | 60 ++ + Documentation/devicetree/bindings/drm/msm/hdmi.txt | 6 + + drivers/gpu/drm/drm_crtc.c | 18 + + drivers/gpu/drm/msm/Kconfig | 7 + + drivers/gpu/drm/msm/Makefile | 5 + + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 6 +- + drivers/gpu/drm/msm/adreno/a3xx.xml.h | 168 +++++- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 15 +- + drivers/gpu/drm/msm/adreno/a4xx.xml.h | 420 ++++++++++++- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 3 +- + drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 6 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 12 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 34 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 9 +- + drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 31 +- + drivers/gpu/drm/msm/dsi/dsi.c | 43 +- + drivers/gpu/drm/msm/dsi/dsi.h | 61 +- + drivers/gpu/drm/msm/dsi/dsi.xml.h | 163 +++++- + drivers/gpu/drm/msm/dsi/dsi_host.c | 120 ++-- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 79 ++- + drivers/gpu/drm/msm/dsi/dsi_phy.c | 315 +++++++++- + drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 12 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll.c | 164 ++++++ + drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 89 +++ + drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c | 652 +++++++++++++++++++++ + drivers/gpu/drm/msm/dsi/sfpb.xml.h | 12 +- + drivers/gpu/drm/msm/edp/edp.xml.h | 101 +++- + drivers/gpu/drm/msm/edp/edp_aux.c | 12 +- + drivers/gpu/drm/msm/edp/edp_ctrl.c | 9 +- + drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 99 +++- + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 43 +- + drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 12 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h | 32 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 39 ++ + drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 9 + + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 3 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 22 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 398 ++++++++++++- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 20 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 128 +++- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 11 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 3 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 24 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 7 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 1 + + drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 16 +- + drivers/gpu/drm/msm/mdp/mdp_format.c | 6 + + drivers/gpu/drm/msm/mdp/mdp_kms.h | 2 +- + drivers/gpu/drm/msm/msm_atomic.c | 46 +- + drivers/gpu/drm/msm/msm_drv.c | 27 +- + drivers/gpu/drm/msm/msm_drv.h | 4 +- + drivers/gpu/drm/msm/msm_gem.c | 4 +- + drivers/gpu/drm/msm/msm_gem.h | 1 + + drivers/gpu/drm/msm/msm_gem_submit.c | 1 - + drivers/gpu/drm/msm/msm_gpu.c | 52 +- + drivers/gpu/drm/msm/msm_gpu.h | 6 +- + drivers/gpu/drm/msm/msm_kms.h | 3 + + include/uapi/drm/drm_fourcc.h | 15 + + include/uapi/drm/msm_drm.h | 76 +-- + 62 files changed, 3475 insertions(+), 391 deletions(-) + create mode 100644 Documentation/devicetree/bindings/drm/msm/dsi.txt + create mode 100644 Documentation/devicetree/bindings/drm/msm/edp.txt + create mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll.c + create mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll.h + create mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c +Merging sound/for-next (8721fa692bc2 Doc: sound:oss: Fix typo in sound/oss) +$ git merge sound/for-next +Auto-merging sound/soc/qcom/lpass-lpaif-reg.h +Removing sound/pci/hda/hda_i915.c +Auto-merging drivers/gpu/drm/i915/intel_audio.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/dma/sh/rcar-dmac.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/adi,adau1701.txt | 4 + + Documentation/devicetree/bindings/sound/bt-sco.txt | 13 + + Documentation/devicetree/bindings/sound/gtm601.txt | 13 + + .../devicetree/bindings/sound/max98090.txt | 6 + + .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 13 +- + .../devicetree/bindings/sound/renesas,rsnd.txt | 3 +- + Documentation/devicetree/bindings/sound/rt5677.txt | 2 + + .../devicetree/bindings/sound/tas571x.txt | 41 + + Documentation/devicetree/bindings/sound/wm8741.txt | 11 + + .../devicetree/bindings/sound/zte,zx-i2s.txt | 44 + + .../devicetree/bindings/sound/zte,zx-spdif.txt | 28 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/sound/alsa/HD-Audio-Models.txt | 14 +- + Documentation/sound/alsa/Jack-Controls.txt | 43 + + Documentation/sound/oss/PSS-updates | 2 +- + Documentation/sound/oss/README.OSS | 2 +- + Documentation/sound/oss/btaudio | 2 +- + MAINTAINERS | 6 + + drivers/dma/sh/rcar-dmac.c | 37 +- + drivers/gpu/drm/i915/i915_reg.h | 3 + + drivers/gpu/drm/i915/intel_audio.c | 27 + + drivers/regulator/arizona-ldo1.c | 5 - + include/drm/i915_component.h | 1 + + include/dt-bindings/sound/apq8016-lpass.h | 9 + + include/dt-bindings/sound/audio-jack-events.h | 9 + + include/dt-bindings/sound/tas2552.h | 18 + + include/sound/control.h | 2 +- + include/sound/core.h | 4 - + include/sound/dmaengine_pcm.h | 5 - + include/sound/emux_synth.h | 2 +- + include/sound/hda_i915.h | 36 + + include/sound/hda_register.h | 244 +++ + include/sound/hdaudio.h | 309 +++- + include/sound/info.h | 37 +- + include/sound/jack.h | 13 +- + include/sound/pcm.h | 5 +- + include/sound/pcm_drm_eld.h | 6 + + include/sound/pcm_iec958.h | 9 + + include/sound/rt5645.h | 3 - + include/sound/soc-dapm.h | 49 + + include/sound/soc-topology.h | 168 ++ + include/sound/soc.h | 118 +- + include/sound/tlv.h | 15 +- + include/uapi/sound/asoc.h | 388 +++++ + include/uapi/sound/tlv.h | 31 + + sound/core/Kconfig | 20 +- + sound/core/Makefile | 13 +- + sound/core/ctljack.c | 41 +- + sound/core/hwdep.c | 6 +- + sound/core/info.c | 833 ++++----- + sound/core/info_oss.c | 29 +- + sound/core/init.c | 59 +- + sound/core/jack.c | 146 +- + sound/core/oss/mixer_oss.c | 6 +- + sound/core/pcm.c | 6 +- + sound/core/pcm_drm_eld.c | 99 ++ + sound/core/pcm_iec958.c | 95 + + sound/core/seq/Makefile | 3 +- + sound/core/seq/oss/seq_oss.c | 6 +- + sound/core/seq/oss/seq_oss_init.c | 5 +- + sound/core/seq/oss/seq_oss_midi.c | 4 +- + sound/core/seq/oss/seq_oss_readq.c | 4 +- + sound/core/seq/oss/seq_oss_synth.c | 4 +- + sound/core/seq/seq_clientmgr.c | 4 +- + sound/core/seq/seq_device.c | 6 +- + sound/core/seq/seq_info.c | 19 +- + sound/core/seq/seq_info.h | 2 +- + sound/core/seq/seq_queue.c | 4 +- + sound/core/seq/seq_timer.c | 4 +- + sound/core/sound.c | 28 +- + sound/core/sound_oss.c | 34 +- + sound/core/timer.c | 4 +- + sound/drivers/aloop.c | 8 - + sound/drivers/dummy.c | 18 +- + sound/drivers/opl4/Makefile | 3 +- + sound/drivers/opl4/opl4_lib.c | 4 - + sound/drivers/opl4/opl4_local.h | 7 +- + sound/drivers/opl4/opl4_proc.c | 4 - + sound/firewire/Kconfig | 1 + + sound/firewire/amdtp.c | 271 +-- + sound/firewire/amdtp.h | 4 + + sound/firewire/bebob/bebob.c | 3 + + sound/firewire/oxfw/oxfw-stream.c | 10 +- + sound/hda/Kconfig | 9 + + sound/hda/Makefile | 5 +- + sound/hda/hda_bus_type.c | 41 + + sound/hda/hdac_bus.c | 20 +- + sound/hda/hdac_controller.c | 507 ++++++ + sound/hda/hdac_device.c | 315 ++++ + sound/hda/hdac_i915.c | 193 +++ + sound/hda/hdac_stream.c | 697 ++++++++ + sound/hda/trace.h | 27 + + sound/i2c/other/ak4xxx-adda.c | 4 - + sound/oss/ad1848.c | 2 + + sound/oss/msnd_pinnacle.c | 3 +- + sound/pci/ac97/Makefile | 2 +- + sound/pci/ac97/ac97_local.h | 2 +- + sound/pci/ad1889.c | 4 +- + sound/pci/ak4531_codec.c | 6 - + sound/pci/ali5451/ali5451.c | 4 +- + sound/pci/als300.c | 4 +- + sound/pci/als4000.c | 4 +- + sound/pci/atiixp.c | 4 - + sound/pci/atiixp_modem.c | 4 - + sound/pci/au88x0/au88x0.c | 4 +- + sound/pci/aw2/aw2-alsa.c | 4 +- + sound/pci/azt3328.c | 4 +- + sound/pci/ca0106/Makefile | 3 +- + sound/pci/ca0106/ca0106_main.c | 6 +- + sound/pci/ca0106/ca0106_proc.c | 4 - + sound/pci/cmipci.c | 5 - + sound/pci/cs46xx/cs46xx_lib.c | 4 +- + sound/pci/cs46xx/cs46xx_lib.h | 4 +- + sound/pci/cs46xx/dsp_spos.c | 4 +- + sound/pci/cs46xx/dsp_spos_scb_lib.c | 6 +- + sound/pci/cs5535audio/cs5535audio.c | 4 +- + sound/pci/ctxfi/cthw20k1.c | 4 +- + sound/pci/ctxfi/cthw20k2.c | 4 +- + sound/pci/emu10k1/Makefile | 3 +- + sound/pci/emu10k1/emu10k1_main.c | 6 +- + sound/pci/emu10k1/emuproc.c | 2 - + sound/pci/es1938.c | 4 +- + sound/pci/es1968.c | 4 +- + sound/pci/hda/Kconfig | 18 +- + sound/pci/hda/Makefile | 9 +- + sound/pci/hda/hda_bind.c | 10 +- + sound/pci/hda/hda_codec.c | 425 +---- + sound/pci/hda/hda_codec.h | 87 +- + sound/pci/hda/hda_controller.c | 1347 +++------------ + sound/pci/hda/hda_controller.h | 272 +-- + sound/pci/hda/hda_controller_trace.h | 98 ++ + sound/pci/hda/hda_eld.c | 4 +- + sound/pci/hda/hda_i915.c | 196 --- + sound/pci/hda/hda_intel.c | 387 +++-- + sound/pci/hda/hda_intel.h | 26 +- + sound/pci/hda/hda_intel_trace.h | 55 +- + sound/pci/hda/hda_jack.c | 90 +- + sound/pci/hda/hda_jack.h | 5 +- + sound/pci/hda/hda_local.h | 4 +- + sound/pci/hda/hda_tegra.c | 102 +- + sound/pci/hda/patch_analog.c | 3 +- + sound/pci/hda/patch_ca0110.c | 3 +- + sound/pci/hda/patch_ca0132.c | 133 +- + sound/pci/hda/patch_cirrus.c | 12 +- + sound/pci/hda/patch_cmedia.c | 4 +- + sound/pci/hda/patch_conexant.c | 3 +- + sound/pci/hda/patch_hdmi.c | 193 ++- + sound/pci/hda/patch_realtek.c | 101 +- + sound/pci/hda/patch_sigmatel.c | 22 +- + sound/pci/hda/patch_via.c | 21 +- + sound/pci/ice1712/ice1712.c | 4 +- + sound/pci/ice1712/quartet.c | 7 +- + sound/pci/intel8x0.c | 4 - + sound/pci/intel8x0m.c | 5 - + sound/pci/lx6464es/lx6464es.c | 18 +- + sound/pci/maestro3.c | 4 +- + sound/pci/mixart/mixart.c | 2 +- + sound/pci/oxygen/oxygen_lib.c | 4 - + sound/pci/oxygen/xonar_wm87x6.c | 2 +- + sound/pci/pcxhr/pcxhr.c | 2 +- + sound/pci/sis7019.c | 10 +- + sound/pci/sonicvibes.c | 4 +- + sound/pci/trident/trident_main.c | 4 +- + sound/ppc/keywest.c | 36 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 2 + + sound/soc/atmel/Kconfig | 20 +- + sound/soc/atmel/Makefile | 8 +- + sound/soc/atmel/atmel-pcm-dma.c | 3 +- + sound/soc/atmel/sam9g20_wm8731.c | 10 +- + sound/soc/au1x/db1200.c | 2 +- + sound/soc/cirrus/ep93xx-pcm.c | 1 - + sound/soc/codecs/88pm860x-codec.c | 19 +- + sound/soc/codecs/Kconfig | 12 +- + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ab8500-codec.c | 20 +- + sound/soc/codecs/ac97.c | 8 +- + sound/soc/codecs/ad1836.c | 2 +- + sound/soc/codecs/adau1373.c | 1 - + sound/soc/codecs/adau1701.c | 126 +- + sound/soc/codecs/adau1761.c | 27 +- + sound/soc/codecs/adau1781.c | 10 +- + sound/soc/codecs/adau17x1.c | 20 +- + sound/soc/codecs/adau1977.c | 14 +- + sound/soc/codecs/adav80x.c | 11 +- + sound/soc/codecs/ak4535.c | 1 - + sound/soc/codecs/ak4641.c | 3 +- + sound/soc/codecs/ak4642.c | 1 - + sound/soc/codecs/ak4671.c | 1 - + sound/soc/codecs/alc5623.c | 3 +- + sound/soc/codecs/alc5632.c | 1 - + sound/soc/codecs/arizona.c | 174 +- + sound/soc/codecs/arizona.h | 17 +- + sound/soc/codecs/bt-sco.c | 11 +- + sound/soc/codecs/cq93vc.c | 1 - + sound/soc/codecs/cs35l32.c | 1 - + sound/soc/codecs/cs4265.c | 1 - + sound/soc/codecs/cs42l52.c | 5 +- + sound/soc/codecs/cs42l56.c | 5 +- + sound/soc/codecs/cs42l73.c | 3 +- + sound/soc/codecs/cs42xx8.c | 2 +- + sound/soc/codecs/cx20442.c | 6 +- + sound/soc/codecs/da7213.c | 3 +- + sound/soc/codecs/da732x.c | 4 +- + sound/soc/codecs/da9055.c | 3 +- + sound/soc/codecs/es8328.c | 3 +- + sound/soc/codecs/isabelle.c | 2 - + sound/soc/codecs/jz4740.c | 4 +- + sound/soc/codecs/lm4857.c | 114 +- + sound/soc/codecs/lm49453.c | 4 +- + sound/soc/codecs/max98088.c | 3 +- + sound/soc/codecs/max98090.c | 34 +- + sound/soc/codecs/max98095.c | 24 +- + sound/soc/codecs/max98357a.c | 3 +- + sound/soc/codecs/max9850.c | 3 +- + sound/soc/codecs/max98925.c | 2 +- + sound/soc/codecs/ml26124.c | 3 +- + sound/soc/codecs/pcm512x.c | 8 +- + sound/soc/codecs/rt286.c | 33 +- + sound/soc/codecs/rt5631.c | 5 +- + sound/soc/codecs/rt5640.c | 16 +- + sound/soc/codecs/rt5645.c | 1089 +++++++++--- + sound/soc/codecs/rt5645.h | 30 +- + sound/soc/codecs/rt5651.c | 5 +- + sound/soc/codecs/rt5670.c | 26 +- + sound/soc/codecs/rt5677.c | 157 +- + sound/soc/codecs/rt5677.h | 15 + + sound/soc/codecs/sgtl5000.c | 56 +- + sound/soc/codecs/sirf-audio-codec.c | 2 +- + sound/soc/codecs/sn95031.c | 12 +- + sound/soc/codecs/ssm2518.c | 9 +- + sound/soc/codecs/ssm2602.c | 5 +- + sound/soc/codecs/ssm4567.c | 9 +- + sound/soc/codecs/sta32x.c | 19 +- + sound/soc/codecs/sta350.c | 9 +- + sound/soc/codecs/sta529.c | 8 +- + sound/soc/codecs/stac9766.c | 3 +- + sound/soc/codecs/tas2552.c | 312 +++- + sound/soc/codecs/tas2552.h | 90 +- + sound/soc/codecs/tas571x.c | 514 ++++++ + sound/soc/codecs/tas571x.h | 33 + + sound/soc/codecs/tlv320aic23.c | 1 - + sound/soc/codecs/tlv320aic31xx.c | 11 +- + sound/soc/codecs/tlv320aic32x4.c | 1 - + sound/soc/codecs/tlv320aic3x.c | 10 +- + sound/soc/codecs/tlv320dac33.c | 5 +- + sound/soc/codecs/ts3a227e.c | 15 +- + sound/soc/codecs/twl4030.c | 3 +- + sound/soc/codecs/twl6040.c | 9 +- + sound/soc/codecs/uda134x.c | 4 +- + sound/soc/codecs/uda1380.c | 6 +- + sound/soc/codecs/wm0010.c | 6 +- + sound/soc/codecs/wm1250-ev1.c | 2 - + sound/soc/codecs/wm5100.c | 12 +- + sound/soc/codecs/wm5102.c | 62 +- + sound/soc/codecs/wm5110.c | 11 +- + sound/soc/codecs/wm8350.c | 3 +- + sound/soc/codecs/wm8400.c | 3 +- + sound/soc/codecs/wm8510.c | 3 +- + sound/soc/codecs/wm8523.c | 3 +- + sound/soc/codecs/wm8580.c | 3 +- + sound/soc/codecs/wm8711.c | 3 +- + sound/soc/codecs/wm8728.c | 3 +- + sound/soc/codecs/wm8731.c | 8 +- + sound/soc/codecs/wm8737.c | 11 +- + sound/soc/codecs/wm8741.c | 129 +- + sound/soc/codecs/wm8741.h | 10 + + sound/soc/codecs/wm8750.c | 3 +- + sound/soc/codecs/wm8753.c | 3 +- + sound/soc/codecs/wm8770.c | 3 +- + sound/soc/codecs/wm8776.c | 3 +- + sound/soc/codecs/wm8804.c | 2 +- + sound/soc/codecs/wm8900.c | 13 +- + sound/soc/codecs/wm8903.c | 4 +- + sound/soc/codecs/wm8903.h | 2 +- + sound/soc/codecs/wm8904.c | 5 +- + sound/soc/codecs/wm8940.c | 6 +- + sound/soc/codecs/wm8955.c | 7 +- + sound/soc/codecs/wm8960.c | 125 +- + sound/soc/codecs/wm8961.c | 6 +- + sound/soc/codecs/wm8962.c | 21 +- + sound/soc/codecs/wm8971.c | 3 +- + sound/soc/codecs/wm8974.c | 3 +- + sound/soc/codecs/wm8978.c | 7 +- + sound/soc/codecs/wm8983.c | 3 +- + sound/soc/codecs/wm8985.c | 3 +- + sound/soc/codecs/wm8988.c | 3 +- + sound/soc/codecs/wm8990.c | 5 +- + sound/soc/codecs/wm8991.c | 3 +- + sound/soc/codecs/wm8993.c | 12 +- + sound/soc/codecs/wm8994.c | 68 +- + sound/soc/codecs/wm8995.c | 6 +- + sound/soc/codecs/wm8996.c | 23 +- + sound/soc/codecs/wm8997.c | 18 +- + sound/soc/codecs/wm9081.c | 4 +- + sound/soc/codecs/wm9090.c | 6 +- + sound/soc/codecs/wm9712.c | 3 +- + sound/soc/codecs/wm9713.c | 7 +- + sound/soc/codecs/wm_adsp.c | 1210 +++++++------ + sound/soc/codecs/wm_adsp.h | 19 +- + sound/soc/codecs/wm_hubs.c | 4 +- + sound/soc/codecs/wmfw.h | 44 +- + sound/soc/davinci/davinci-mcasp.c | 167 +- + sound/soc/fsl/fsl_dma.c | 4 +- + sound/soc/fsl/fsl_sai.c | 144 +- + sound/soc/fsl/fsl_sai.h | 9 +- + sound/soc/fsl/fsl_spdif.c | 10 +- + sound/soc/fsl/fsl_ssi.c | 7 - + sound/soc/fsl/imx-audmux.c | 2 +- + sound/soc/fsl/imx-mc13783.c | 6 +- + sound/soc/generic/simple-card.c | 16 +- + sound/soc/intel/Kconfig | 17 +- + sound/soc/intel/atom/sst-atom-controls.c | 167 +- + sound/soc/intel/atom/sst-atom-controls.h | 9 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 47 +- + sound/soc/intel/atom/sst-mfld-platform.h | 2 + + sound/soc/intel/atom/sst/sst_acpi.c | 4 + + sound/soc/intel/baytrail/sst-baytrail-ipc.c | 11 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 318 ++++ + sound/soc/intel/boards/cht_bsw_rt5645.c | 118 +- + sound/soc/intel/common/sst-ipc.c | 34 +- + sound/soc/intel/common/sst-ipc.h | 7 +- + sound/soc/intel/haswell/sst-haswell-ipc.c | 12 + + sound/soc/intel/haswell/sst-haswell-pcm.c | 32 +- + sound/soc/omap/Kconfig | 5 +- + sound/soc/omap/omap-twl4030.c | 3 +- + sound/soc/omap/rx51.c | 30 +- + sound/soc/pxa/brownstone.c | 25 +- + sound/soc/pxa/poodle.c | 19 +- + sound/soc/pxa/tosa.c | 13 +- + sound/soc/pxa/z2.c | 9 +- + sound/soc/qcom/Kconfig | 19 +- + sound/soc/qcom/Makefile | 4 + + sound/soc/qcom/lpass-apq8016.c | 242 +++ + sound/soc/qcom/lpass-cpu.c | 240 +-- + sound/soc/qcom/lpass-ipq806x.c | 109 ++ + .../{lpass-lpaif-ipq806x.h => lpass-lpaif-reg.h} | 92 +- + sound/soc/qcom/lpass-platform.c | 202 ++- + sound/soc/qcom/lpass.h | 51 +- + sound/soc/samsung/Kconfig | 15 +- + sound/soc/samsung/i2s.c | 2 +- + sound/soc/samsung/lowland.c | 2 +- + sound/soc/samsung/smartq_wm8987.c | 6 +- + sound/soc/samsung/smdk_wm8994.c | 3 +- + sound/soc/samsung/speyside.c | 2 +- + sound/soc/sh/rcar/core.c | 32 +- + sound/soc/sh/rcar/rsnd.h | 3 +- + sound/soc/sh/rcar/rsrc-card.c | 1 + + sound/soc/sh/rcar/src.c | 11 +- + sound/soc/sh/rcar/ssi.c | 70 +- + sound/soc/soc-core.c | 67 +- + sound/soc/soc-dapm.c | 349 +++- + sound/soc/soc-generic-dmaengine-pcm.c | 25 +- + sound/soc/soc-jack.c | 12 +- + sound/soc/soc-pcm.c | 47 +- + sound/soc/soc-topology.c | 1826 ++++++++++++++++++++ + sound/soc/ux500/mop500_ab8500.c | 4 + + sound/soc/ux500/ux500_pcm.c | 1 - + sound/soc/zte/Kconfig | 17 + + sound/soc/zte/Makefile | 2 + + sound/soc/zte/zx296702-i2s.c | 436 +++++ + sound/soc/zte/zx296702-spdif.c | 365 ++++ + sound/sound_firmware.c | 4 +- + sound/synth/emux/Makefile | 5 +- + sound/synth/emux/emux.c | 4 - + sound/synth/emux/emux_proc.c | 4 - + sound/synth/emux/emux_voice.h | 6 +- + sound/usb/bcd2000/bcd2000.c | 2 +- + 369 files changed, 14324 insertions(+), 5720 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/bt-sco.txt + create mode 100644 Documentation/devicetree/bindings/sound/gtm601.txt + create mode 100644 Documentation/devicetree/bindings/sound/tas571x.txt + create mode 100644 Documentation/devicetree/bindings/sound/zte,zx-i2s.txt + create mode 100644 Documentation/devicetree/bindings/sound/zte,zx-spdif.txt + create mode 100644 Documentation/sound/alsa/Jack-Controls.txt + create mode 100644 include/dt-bindings/sound/apq8016-lpass.h + create mode 100644 include/dt-bindings/sound/audio-jack-events.h + create mode 100644 include/dt-bindings/sound/tas2552.h + create mode 100644 include/sound/hda_i915.h + create mode 100644 include/sound/hda_register.h + create mode 100644 include/sound/pcm_drm_eld.h + create mode 100644 include/sound/pcm_iec958.h + create mode 100644 include/sound/soc-topology.h + create mode 100644 include/uapi/sound/asoc.h + create mode 100644 include/uapi/sound/tlv.h + create mode 100644 sound/core/pcm_drm_eld.c + create mode 100644 sound/core/pcm_iec958.c + create mode 100644 sound/hda/hdac_controller.c + create mode 100644 sound/hda/hdac_i915.c + create mode 100644 sound/hda/hdac_stream.c + create mode 100644 sound/pci/hda/hda_controller_trace.h + delete mode 100644 sound/pci/hda/hda_i915.c + create mode 100644 sound/soc/codecs/tas571x.c + create mode 100644 sound/soc/codecs/tas571x.h + create mode 100644 sound/soc/intel/boards/cht_bsw_max98090_ti.c + create mode 100644 sound/soc/qcom/lpass-apq8016.c + create mode 100644 sound/soc/qcom/lpass-ipq806x.c + rename sound/soc/qcom/{lpass-lpaif-ipq806x.h => lpass-lpaif-reg.h} (64%) + create mode 100644 sound/soc/soc-topology.c + create mode 100644 sound/soc/zte/Kconfig + create mode 100644 sound/soc/zte/Makefile + create mode 100644 sound/soc/zte/zx296702-i2s.c + create mode 100644 sound/soc/zte/zx296702-spdif.c +Merging sound-asoc/for-next (ef36ac8223ff Merge remote-tracking branch 'asoc/topic/wm8741' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/qcom,apq8016-sbc.txt | 60 +++++++ + Documentation/devicetree/bindings/sound/rt5645.txt | 72 ++++++++ + .../devicetree/bindings/sound/tas2552.txt | 6 + + include/sound/rt5645.h | 3 - + sound/soc/codecs/rt5645.c | 54 ++---- + sound/soc/codecs/rt5645.h | 1 + + sound/soc/codecs/tas2552.c | 173 ++++++++++++------ + sound/soc/codecs/tas2552.h | 61 ++++--- + sound/soc/codecs/wm8741.c | 61 +++---- + sound/soc/davinci/davinci-mcasp.c | 72 ++++++-- + sound/soc/davinci/davinci-mcasp.h | 5 +- + sound/soc/fsl/imx-wm8962.c | 2 +- + sound/soc/omap/rx51.c | 10 +- + sound/soc/qcom/Kconfig | 9 + + sound/soc/qcom/Makefile | 2 + + sound/soc/qcom/apq8016_sbc.c | 198 +++++++++++++++++++++ + sound/soc/qcom/storm.c | 26 +-- + 17 files changed, 620 insertions(+), 195 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt5645.txt + create mode 100644 sound/soc/qcom/apq8016_sbc.c +Merging modules/modules-next (6727bb9c6abe kernel/module.c: avoid ifdefs for sig_enforce declaration) +$ git merge modules/modules-next +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging net/sunrpc/xprtsock.c +Auto-merging kernel/module.c +Auto-merging init/Kconfig +Auto-merging include/linux/module.h +Auto-merging drivers/tty/sysrq.c +Auto-merging drivers/thermal/intel_powerclamp.c +Auto-merging drivers/net/wireless/ath/wil6210/main.c +Auto-merging drivers/infiniband/ulp/srp/ib_srp.c +Merge made by the 'recursive' strategy. + arch/s390/kernel/perf_cpum_sf.c | 2 +- + arch/x86/kvm/mmu_audit.c | 2 +- + arch/x86/platform/uv/uv_nmi.c | 2 +- + drivers/block/null_blk.c | 4 +- + drivers/char/ipmi/ipmi_watchdog.c | 6 +- + drivers/dma/dmatest.c | 4 +- + drivers/ide/ide.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 4 +- + drivers/input/misc/ati_remote2.c | 4 +- + drivers/input/mouse/psmouse-base.c | 2 +- + drivers/misc/lis3lv02d/lis3lv02d.c | 2 +- + drivers/mtd/ubi/block.c | 2 +- + drivers/net/wireless/ath/wil6210/main.c | 4 +- + drivers/power/test_power.c | 16 +- + drivers/thermal/intel_powerclamp.c | 4 +- + drivers/tty/hvc/hvc_iucv.c | 2 +- + drivers/tty/sysrq.c | 2 +- + drivers/video/fbdev/uvesafb.c | 2 +- + drivers/virtio/virtio_mmio.c | 2 +- + fs/nfs/super.c | 2 +- + include/linux/compiler.h | 15 ++ + include/linux/kernel.h | 18 +- + include/linux/module.h | 43 ++++- + include/linux/moduleparam.h | 36 ++-- + include/linux/rbtree.h | 16 +- + include/linux/rbtree_augmented.h | 21 ++- + include/linux/rbtree_latch.h | 212 ++++++++++++++++++++++ + include/linux/rcupdate.h | 15 -- + include/linux/seqlock.h | 81 ++++++++- + init/Kconfig | 4 + + kernel/jump_label.c | 10 +- + kernel/module.c | 300 ++++++++++++++++++++++++-------- + kernel/params.c | 45 ++++- + kernel/time/timekeeping.c | 29 +-- + kernel/workqueue.c | 7 +- + lib/bug.c | 7 +- + lib/rbtree.c | 76 +++++--- + net/sunrpc/auth.c | 2 +- + net/sunrpc/xprtsock.c | 6 +- + security/apparmor/lsm.c | 6 +- + security/integrity/ima/ima_crypto.c | 2 +- + sound/pci/hda/hda_intel.c | 2 +- + 42 files changed, 781 insertions(+), 242 deletions(-) + create mode 100644 include/linux/rbtree_latch.h +Merging input/next (e70b03071c5d Input: goodix - export id and version read from device) +$ git merge input/next +Auto-merging drivers/tty/sysrq.c +Auto-merging drivers/input/touchscreen/stmpe-ts.c +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/mouse/psmouse-base.c +Auto-merging drivers/input/mouse/alps.c +Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/trivial-devices.txt | 3 +- + .../devicetree/bindings/input/ti,drv2665.txt | 17 ++ + drivers/input/evdev.c | 5 +- + drivers/input/ff-core.c | 4 +- + drivers/input/input.c | 2 +- + drivers/input/keyboard/Kconfig | 1 + + drivers/input/keyboard/adp5589-keys.c | 6 +- + drivers/input/keyboard/max7359_keypad.c | 31 +- + drivers/input/keyboard/samsung-keypad.c | 2 +- + drivers/input/keyboard/spear-keyboard.c | 2 +- + drivers/input/misc/Kconfig | 23 +- + drivers/input/misc/Makefile | 2 + + drivers/input/misc/adxl34x-i2c.c | 21 ++ + drivers/input/misc/da9063_onkey.c | 226 +++++++++++++++ + drivers/input/misc/drv2665.c | 322 +++++++++++++++++++++ + drivers/input/misc/retu-pwrbutton.c | 3 +- + drivers/input/misc/soc_button_array.c | 1 - + drivers/input/misc/twl4030-pwrbutton.c | 3 +- + drivers/input/misc/twl6040-vibra.c | 3 +- + drivers/input/misc/wm831x-on.c | 3 +- + drivers/input/mouse/alps.c | 244 ++++++++-------- + drivers/input/mouse/alps.h | 1 + + drivers/input/mouse/cyapa_gen3.c | 3 +- + drivers/input/mouse/cyapa_gen5.c | 23 +- + drivers/input/mouse/elan_i2c.h | 8 +- + drivers/input/mouse/elan_i2c_core.c | 63 +++- + drivers/input/mouse/elan_i2c_i2c.c | 4 +- + drivers/input/mouse/elan_i2c_smbus.c | 6 +- + drivers/input/mouse/focaltech.c | 13 + + drivers/input/mouse/psmouse-base.c | 2 +- + drivers/input/mouse/sentelic.h | 4 +- + drivers/input/mouse/synaptics_i2c.c | 6 +- + drivers/input/touchscreen/Kconfig | 1 + + drivers/input/touchscreen/atmel_mxt_ts.c | 8 +- + drivers/input/touchscreen/goodix.c | 54 ++-- + drivers/input/touchscreen/s3c2410_ts.c | 2 +- + drivers/input/touchscreen/stmpe-ts.c | 37 +-- + drivers/input/touchscreen/zforce_ts.c | 1 - + drivers/tty/sysrq.c | 19 +- + include/linux/mfd/da9063/pdata.h | 1 + + include/linux/mfd/stmpe.h | 44 --- + include/linux/platform_data/keyboard-spear.h | 2 +- + 42 files changed, 914 insertions(+), 312 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/ti,drv2665.txt + create mode 100644 drivers/input/misc/da9063_onkey.c + create mode 100644 drivers/input/misc/drv2665.c +Merging block/for-next (e4bb709481e6 Merge branch 'for-4.2/drivers' into for-next) +$ git merge block/for-next +Recorded preimage for 'MAINTAINERS' +Resolved 'drivers/block/nvme-core.c' using previous resolution. +Resolved 'drivers/md/dm.c' using previous resolution. +Resolved 'include/linux/blkdev.h' using previous resolution. +Resolved 'mm/backing-dev.c' using previous resolution. +Resolved 'mm/page-writeback.c' using previous resolution. +Auto-merging mm/page-writeback.c +CONFLICT (content): Merge conflict in mm/page-writeback.c +Auto-merging mm/backing-dev.c +CONFLICT (content): Merge conflict in mm/backing-dev.c +Removing kernel/power/block_io.c +Auto-merging init/Kconfig +Auto-merging include/trace/events/writeback.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/blkdev.h +CONFLICT (content): Merge conflict in include/linux/blkdev.h +Auto-merging include/linux/blk_types.h +Auto-merging include/linux/blk-cgroup.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/nfs/write.c +Auto-merging fs/inode.c +Auto-merging fs/fuse/file.c +Auto-merging fs/f2fs/segment.h +Auto-merging fs/f2fs/node.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/page-io.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext4/extents.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging drivers/md/dm.c +CONFLICT (content): Merge conflict in drivers/md/dm.c +Auto-merging drivers/md/dm-table.c +Auto-merging drivers/block/nvme-scsi.c +Auto-merging drivers/block/nvme-core.c +CONFLICT (content): Merge conflict in drivers/block/nvme-core.c +Auto-merging drivers/block/null_blk.c +Auto-merging drivers/block/loop.c +Auto-merging block/genhd.c +Auto-merging block/elevator.c +Auto-merging block/bounce.c +Auto-merging block/blk-sysfs.c +Auto-merging block/blk-mq.c +Auto-merging block/blk-core.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'MAINTAINERS'. +[master fa3b2f2f1243] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/cgroups/memory.txt | 1 + + MAINTAINERS | 2 + + block/bio-integrity.c | 4 +- + block/bio.c | 112 +- + block/blk-cgroup.c | 211 ++-- + block/blk-core.c | 206 ++-- + block/blk-exec.c | 10 - + block/blk-integrity.c | 1 + + block/blk-merge.c | 3 +- + block/blk-mq-tag.c | 38 + + block/blk-mq-tag.h | 1 + + block/blk-mq.c | 160 ++- + block/blk-sysfs.c | 3 +- + block/blk-throttle.c | 2 +- + block/blk.h | 5 +- + block/bounce.c | 4 +- + block/cfq-iosched.c | 85 +- + block/elevator.c | 4 +- + block/genhd.c | 1 + + block/ioctl.c | 37 +- + drivers/block/cciss.c | 27 +- + drivers/block/drbd/drbd_int.h | 1 + + drivers/block/drbd/drbd_main.c | 10 +- + drivers/block/loop.c | 82 +- + drivers/block/loop.h | 3 +- + drivers/block/nbd.c | 52 +- + drivers/block/null_blk.c | 14 +- + drivers/block/nvme-core.c | 812 +++++++------ + drivers/block/nvme-scsi.c | 1224 ++++++------------- + drivers/block/paride/pd.c | 4 +- + drivers/block/pktcdvd.c | 1 + + drivers/block/ps3vram.c | 34 +- + drivers/block/sx8.c | 4 +- + drivers/block/virtio_blk.c | 6 +- + drivers/char/raw.c | 1 + + drivers/ide/ide-atapi.c | 10 +- + drivers/ide/ide-cd.c | 10 +- + drivers/ide/ide-cd_ioctl.c | 2 +- + drivers/ide/ide-devsets.c | 2 +- + drivers/ide/ide-eh.c | 4 +- + drivers/ide/ide-floppy.c | 8 +- + drivers/ide/ide-io.c | 12 +- + drivers/ide/ide-ioctls.c | 2 +- + drivers/ide/ide-park.c | 4 +- + drivers/ide/ide-pm.c | 56 +- + drivers/ide/ide-tape.c | 6 +- + drivers/ide/ide-taskfile.c | 2 +- + drivers/md/bcache/io.c | 2 +- + drivers/md/bcache/request.c | 3 +- + drivers/md/dm-cache-target.c | 6 - + drivers/md/dm-raid1.c | 2 - + drivers/md/dm-snap.c | 1 - + drivers/md/dm-table.c | 25 +- + drivers/md/dm-thin.c | 9 +- + drivers/md/dm-verity.c | 2 +- + drivers/md/dm.c | 173 +-- + drivers/md/dm.h | 6 +- + drivers/md/md.h | 1 + + drivers/md/raid1.c | 4 +- + drivers/md/raid10.c | 2 +- + drivers/mtd/devices/block2mtd.c | 1 + + drivers/s390/block/dasd_genhd.c | 19 +- + .../lustre/include/linux/lustre_patchless_compat.h | 4 +- + fs/9p/v9fs.c | 50 +- + fs/9p/vfs_super.c | 8 +- + fs/block_dev.c | 9 +- + fs/btrfs/disk-io.c | 13 +- + fs/btrfs/extent_io.c | 2 - + fs/btrfs/volumes.c | 18 +- + fs/btrfs/volumes.h | 2 - + fs/buffer.c | 75 +- + fs/ext2/super.c | 2 +- + fs/ext4/extents.c | 1 + + fs/ext4/mballoc.c | 1 + + fs/ext4/page-io.c | 1 - + fs/ext4/super.c | 1 + + fs/f2fs/node.c | 4 +- + fs/f2fs/segment.h | 3 +- + fs/fat/file.c | 1 + + fs/fat/inode.c | 1 + + fs/fs-writeback.c | 1157 ++++++++++++++---- + fs/fuse/file.c | 12 +- + fs/gfs2/super.c | 2 +- + fs/hfs/super.c | 1 + + fs/hfsplus/super.c | 1 + + fs/inode.c | 1 + + fs/mpage.c | 3 + + fs/nfs/filelayout/filelayout.c | 1 + + fs/nfs/internal.h | 2 +- + fs/nfs/write.c | 3 +- + fs/nilfs2/segbuf.c | 12 - + fs/ocfs2/file.c | 1 + + fs/reiserfs/super.c | 1 + + fs/ufs/super.c | 1 + + fs/xfs/xfs_aops.c | 13 +- + fs/xfs/xfs_file.c | 1 + + include/linux/backing-dev-defs.h | 255 ++++ + include/linux/backing-dev.h | 557 ++++++--- + include/linux/bio.h | 20 +- + {block => include/linux}/blk-cgroup.h | 72 +- + include/linux/blk-mq.h | 4 + + include/linux/blk_types.h | 25 +- + include/linux/blkdev.h | 66 +- + include/linux/cgroup.h | 25 + + include/linux/elevator.h | 2 + + include/linux/fs.h | 27 +- + include/linux/ide.h | 27 + + include/linux/memcontrol.h | 29 + + include/linux/mm.h | 8 +- + include/linux/nvme.h | 31 +- + include/linux/pagemap.h | 3 +- + include/linux/swap.h | 1 - + include/linux/writeback.h | 221 +++- + include/trace/events/writeback.h | 15 +- + include/uapi/linux/nbd.h | 2 - + include/uapi/linux/nvme.h | 5 + + init/Kconfig | 5 + + kernel/power/Makefile | 3 +- + kernel/power/block_io.c | 103 -- + kernel/power/power.h | 9 - + kernel/power/swap.c | 159 ++- + mm/backing-dev.c | 635 ++++++++-- + mm/fadvise.c | 2 +- + mm/filemap.c | 34 +- + mm/madvise.c | 1 + + mm/memcontrol.c | 223 +++- + mm/page-writeback.c | 1231 +++++++++++++------- + mm/page_io.c | 2 +- + mm/readahead.c | 2 +- + mm/rmap.c | 2 + + mm/truncate.c | 18 +- + mm/vmscan.c | 79 +- + 132 files changed, 5535 insertions(+), 3315 deletions(-) + create mode 100644 include/linux/backing-dev-defs.h + rename {block => include/linux}/blk-cgroup.h (90%) + delete mode 100644 kernel/power/block_io.c +Merging device-mapper/for-next (64dde3311eac dm stats: add support for request-based DM devices) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm.c +Merge made by the 'recursive' strategy. + Documentation/device-mapper/cache.txt | 9 +- + Documentation/device-mapper/dm-raid.txt | 2 + + Documentation/device-mapper/statistics.txt | 38 +- + drivers/md/Kconfig | 10 + + drivers/md/Makefile | 2 + + drivers/md/dm-bio-prison.c | 26 + + drivers/md/dm-bio-prison.h | 13 + + drivers/md/dm-cache-metadata.c | 133 +- + drivers/md/dm-cache-metadata.h | 10 + + drivers/md/dm-cache-policy-cleaner.c | 6 +- + drivers/md/dm-cache-policy-internal.h | 52 +- + drivers/md/dm-cache-policy-mq.c | 59 +- + drivers/md/dm-cache-policy-smq.c | 1774 +++++++++++++++++++++++++ + drivers/md/dm-cache-policy.h | 30 +- + drivers/md/dm-cache-target.c | 832 +++++++++--- + drivers/md/dm-crypt.c | 30 +- + drivers/md/dm-log-writes.c | 4 +- + drivers/md/dm-raid.c | 225 ++-- + drivers/md/dm-raid1.c | 75 +- + drivers/md/dm-stats.c | 341 ++++- + drivers/md/dm-stats.h | 4 +- + drivers/md/dm-stripe.c | 4 +- + drivers/md/dm-table.c | 4 +- + drivers/md/dm-thin-metadata.c | 117 +- + drivers/md/dm-thin-metadata.h | 11 + + drivers/md/dm-thin.c | 612 ++++++--- + drivers/md/dm.c | 190 +-- + drivers/md/persistent-data/dm-block-manager.c | 6 + + drivers/md/persistent-data/dm-block-manager.h | 1 + + drivers/md/persistent-data/dm-btree-remove.c | 127 ++ + drivers/md/persistent-data/dm-btree.h | 9 + + 31 files changed, 4083 insertions(+), 673 deletions(-) + create mode 100644 drivers/md/dm-cache-policy-smq.c +Merging pcmcia/master (f2e6cf76751d pcmcia: Convert dev_printk to dev_<level>) +$ git merge pcmcia/master +Merge made by the 'recursive' strategy. + drivers/char/pcmcia/cm4040_cs.c | 5 ++- + drivers/pcmcia/cistpl.c | 22 ++++++------ + drivers/pcmcia/cs.c | 29 +++++++-------- + drivers/pcmcia/ds.c | 56 ++++++++++++++--------------- + drivers/pcmcia/electra_cf.c | 19 +++++----- + drivers/pcmcia/i82365.c | 43 ++++++++++------------ + drivers/pcmcia/m32r_cfc.c | 7 ---- + drivers/pcmcia/m32r_pcc.c | 7 ---- + drivers/pcmcia/pcmcia_cis.c | 4 +-- + drivers/pcmcia/pcmcia_resource.c | 11 +++--- + drivers/pcmcia/rsrc_nonstatic.c | 44 +++++++++++------------ + drivers/pcmcia/ti113x.h | 78 +++++++++++++++++++--------------------- + drivers/pcmcia/vrc4171_card.c | 30 ++++++++-------- + drivers/pcmcia/yenta_socket.c | 61 +++++++++++++++---------------- + 14 files changed, 185 insertions(+), 231 deletions(-) +Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) +$ git merge mmc/mmc-next +Already up-to-date. +Merging mmc-uh/next (5fd26c7ecb32 mmc: sdhci: Restore behavior while creating OCR mask) +$ git merge mmc-uh/next +Auto-merging arch/powerpc/boot/dts/fsl/p5040si-post.dtsi +Auto-merging arch/powerpc/boot/dts/fsl/p5020si-post.dtsi +Auto-merging arch/powerpc/boot/dts/fsl/p4080si-post.dtsi +Auto-merging arch/powerpc/boot/dts/fsl/p3041si-post.dtsi +Auto-merging arch/powerpc/boot/dts/fsl/p2041si-post.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.txt | 3 +- + .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 9 +- + .../devicetree/bindings/mmc/k3-dw-mshc.txt | 28 ++ + .../devicetree/bindings/mmc/mmc-pwrseq-simple.txt | 4 +- + Documentation/devicetree/bindings/mmc/mmc.txt | 5 + + .../devicetree/bindings/mmc/renesas,mmcif.txt | 3 + + MAINTAINERS | 2 +- + arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 1 + + arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 1 + + arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 1 + + arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 1 + + arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 1 + + drivers/mmc/card/block.c | 17 +- + drivers/mmc/card/mmc_test.c | 104 ++------ + drivers/mmc/card/queue.h | 1 + + drivers/mmc/core/core.c | 100 ++++++- + drivers/mmc/core/core.h | 4 + + drivers/mmc/core/host.c | 88 ++++++ + drivers/mmc/core/host.h | 6 + + drivers/mmc/core/mmc.c | 156 +++++++++-- + drivers/mmc/core/mmc_ops.c | 44 +-- + drivers/mmc/core/mmc_ops.h | 1 + + drivers/mmc/core/sd.c | 113 +++----- + drivers/mmc/core/sdio.c | 90 +++---- + drivers/mmc/core/sdio_bus.c | 12 +- + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/davinci_mmc.c | 2 +- + drivers/mmc/host/dw_mmc-exynos.c | 2 +- + drivers/mmc/host/dw_mmc-k3.c | 105 +++++++- + drivers/mmc/host/dw_mmc-rockchip.c | 2 +- + drivers/mmc/host/dw_mmc.c | 57 ++-- + drivers/mmc/host/dw_mmc.h | 5 +- + drivers/mmc/host/mxcmmc.c | 6 +- + drivers/mmc/host/mxs-mmc.c | 2 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 2 +- + drivers/mmc/host/rtsx_usb_sdmmc.c | 2 +- + drivers/mmc/host/s3cmci.c | 2 +- + drivers/mmc/host/sdhci-bcm2835.c | 12 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 94 +++++-- + drivers/mmc/host/sdhci-of-arasan.c | 7 + + drivers/mmc/host/sdhci-of-esdhc.c | 11 +- + drivers/mmc/host/sdhci-pci-data.c | 3 + + drivers/mmc/host/sdhci-pci.c | 84 ++++++ + drivers/mmc/host/sdhci-pci.h | 4 + + drivers/mmc/host/sdhci-pxav2.c | 4 +- + drivers/mmc/host/sdhci-pxav3.c | 10 +- + drivers/mmc/host/sdhci-s3c.c | 2 +- + drivers/mmc/host/sdhci-sirf.c | 44 ++- + drivers/mmc/host/sdhci-st.c | 2 +- + drivers/mmc/host/sdhci.c | 149 +++-------- + drivers/mmc/host/sdhci.h | 7 +- + drivers/mmc/host/sdhci_f_sdh30.c | 9 +- + drivers/mmc/host/sh_mmcif.c | 296 ++++++++++++++------- + drivers/mmc/host/tmio_mmc.c | 10 +- + drivers/mmc/host/tmio_mmc_pio.c | 5 +- + include/linux/mmc/card.h | 2 + + include/linux/mmc/dw_mmc.h | 6 - + include/linux/mmc/host.h | 28 +- + include/linux/mmc/mmc.h | 4 + + include/linux/mmc/sdhci-pci-data.h | 2 + + 60 files changed, 1185 insertions(+), 593 deletions(-) +Merging kgdb/kgdb-next (2d289f14f00a 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 (38f31b94147c md/raid5: ignore released_stripes check) +$ git merge md/for-next +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + drivers/md/md.c | 149 ++++++++++++++++++++++++++++----------------------- + drivers/md/raid10.c | 18 ++----- + drivers/md/raid5.c | 46 ++++++++++------ + drivers/md/raid5.h | 3 +- + include/linux/wait.h | 13 +++++ + 5 files changed, 130 insertions(+), 99 deletions(-) +Merging mfd/for-mfd-next (bdb2ad5f4b95 mfd: si476x-i2c: Pass the IRQF_ONESHOT flag) +$ git merge mfd/for-mfd-next +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging drivers/rtc/Makefile +Auto-merging drivers/rtc/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 07181d442f9a] Merge remote-tracking branch 'mfd/for-mfd-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/mfd/arizona.txt | 13 +- + Documentation/devicetree/bindings/mfd/axp20x.txt | 32 +- + Documentation/devicetree/bindings/mfd/da9063.txt | 18 + + Documentation/devicetree/bindings/mfd/max77686.txt | 2 +- + Documentation/devicetree/bindings/mfd/max77693.txt | 67 ++++ + .../devicetree/bindings/rtc/rtc-st-lpc.txt | 25 ++ + .../devicetree/bindings/watchdog/st_lpc_wdt.txt | 38 +++ + MAINTAINERS | 17 +- + drivers/mfd/88pm860x-core.c | 2 +- + drivers/mfd/Kconfig | 6 +- + drivers/mfd/Makefile | 6 +- + drivers/mfd/ab8500-core.c | 2 +- + drivers/mfd/ab8500-debugfs.c | 2 +- + drivers/mfd/ab8500-gpadc.c | 6 +- + drivers/mfd/arizona-core.c | 361 +++++++++++++++++---- + drivers/mfd/arizona-irq.c | 2 +- + drivers/mfd/axp20x.c | 100 ++++++ + drivers/mfd/cros_ec.c | 22 +- + drivers/mfd/cros_ec_i2c.c | 1 - + drivers/mfd/cros_ec_spi.c | 1 - + drivers/mfd/da9052-irq.c | 4 +- + drivers/mfd/da9055-core.c | 6 +- + drivers/mfd/da9063-core.c | 54 +++ + drivers/mfd/da9063-irq.c | 4 +- + drivers/mfd/da9150-core.c | 4 +- + drivers/mfd/db8500-prcmu.c | 2 +- + drivers/mfd/htc-i2cpld.c | 3 +- + drivers/mfd/intel_soc_pmic_core.h | 2 +- + drivers/mfd/intel_soc_pmic_crc.c | 2 +- + drivers/mfd/lp8788-irq.c | 2 +- + drivers/mfd/max8925-core.c | 2 +- + drivers/mfd/max8997-irq.c | 2 +- + drivers/mfd/max8998-irq.c | 2 +- + drivers/mfd/mc13xxx-core.c | 2 +- + drivers/mfd/mfd-core.c | 8 +- + drivers/mfd/mt6397-core.c | 5 +- + drivers/mfd/si476x-i2c.c | 3 +- + drivers/mfd/stmpe.c | 2 +- + drivers/mfd/tc3589x.c | 2 +- + drivers/mfd/tps6586x.c | 2 +- + drivers/mfd/twl4030-irq.c | 2 +- + drivers/mfd/twl4030-power.c | 45 ++- + drivers/mfd/twl6030-irq.c | 2 +- + drivers/mfd/wm831x-auxadc.c | 3 +- + drivers/mfd/wm831x-irq.c | 2 +- + drivers/mfd/wm8350-core.c | 3 +- + drivers/mfd/wm8994-irq.c | 6 +- + drivers/platform/chrome/cros_ec_lpc.c | 1 - + drivers/regulator/axp20x-regulator.c | 239 +++++++++++--- + drivers/rtc/Kconfig | 11 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-st-lpc.c | 354 ++++++++++++++++++++ + drivers/watchdog/Kconfig | 12 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/st_lpc_wdt.c | 344 ++++++++++++++++++++ + include/dt-bindings/mfd/arizona.h | 14 + + include/linux/i2c/twl.h | 1 + + include/linux/mfd/arizona/core.h | 9 + + include/linux/mfd/arizona/pdata.h | 5 +- + include/linux/mfd/arizona/registers.h | 27 +- + include/linux/mfd/axp20x.h | 86 +++++ + include/linux/mfd/cros_ec.h | 2 - + include/linux/mfd/da9055/core.h | 2 +- + include/linux/mfd/max77686.h | 5 - + 64 files changed, 1805 insertions(+), 208 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-st-lpc.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt + create mode 100644 drivers/rtc/rtc-st-lpc.c + create mode 100644 drivers/watchdog/st_lpc_wdt.c +Merging backlight/for-backlight-next (a7f6d4571393 backlight: pwm_bl: Simplify usage of devm_gpiod_get_optional) +$ git merge backlight/for-backlight-next +Auto-merging drivers/video/backlight/pwm_bl.c +Merge made by the 'recursive' strategy. + drivers/video/backlight/Kconfig | 8 +++++--- + drivers/video/backlight/da9052_bl.c | 2 +- + drivers/video/backlight/gpio_backlight.c | 2 ++ + drivers/video/backlight/lp855x_bl.c | 18 ++++++------------ + drivers/video/backlight/pwm_bl.c | 6 ++---- + drivers/video/fbdev/imxfb.c | 2 +- + drivers/video/fbdev/mxsfb.c | 2 +- + drivers/video/fbdev/s3c-fb.c | 2 +- + 8 files changed, 19 insertions(+), 23 deletions(-) +Merging battery/master (f4ed950a63fc sbs-battery: add option to always register battery) +$ git merge battery/master +Auto-merging include/linux/mfd/axp20x.h +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/bq24257.txt | 21 + + .../devicetree/bindings/power/bq25890.txt | 46 + + .../devicetree/bindings/power/rt9455_charger.txt | 48 + + .../bindings/power_supply/max17042_battery.txt | 13 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/power/88pm860x_charger.c | 1 - + drivers/power/Kconfig | 28 + + drivers/power/Makefile | 4 + + drivers/power/axp288_charger.c | 941 +++++++++++ + drivers/power/axp288_fuel_gauge.c | 2 +- + drivers/power/bq2415x_charger.c | 94 +- + drivers/power/bq24190_charger.c | 11 +- + drivers/power/bq24257_charger.c | 863 ++++++++++ + drivers/power/bq25890_charger.c | 999 +++++++++++ + drivers/power/charger-manager.c | 3 +- + drivers/power/max17042_battery.c | 199 ++- + drivers/power/power_supply_core.c | 100 +- + drivers/power/power_supply_leds.c | 4 +- + drivers/power/power_supply_sysfs.c | 4 +- + drivers/power/reset/at91-reset.c | 2 +- + drivers/power/reset/gpio-poweroff.c | 25 +- + drivers/power/reset/gpio-restart.c | 2 +- + drivers/power/reset/ltc2952-poweroff.c | 7 +- + drivers/power/rt9455_charger.c | 1755 ++++++++++++++++++++ + drivers/power/sbs-battery.c | 21 +- + include/linux/mfd/axp20x.h | 7 + + include/linux/power/max17042_battery.h | 4 + + include/linux/power_supply.h | 11 + + 28 files changed, 5131 insertions(+), 85 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/bq24257.txt + create mode 100644 Documentation/devicetree/bindings/power/bq25890.txt + create mode 100644 Documentation/devicetree/bindings/power/rt9455_charger.txt + create mode 100644 drivers/power/axp288_charger.c + create mode 100644 drivers/power/bq24257_charger.c + create mode 100644 drivers/power/bq25890_charger.c + create mode 100644 drivers/power/rt9455_charger.c +Merging omap_dss2/for-next (8dc0a56529f5 Merge branch 'ti-dra7-dss' into 4.2/fbdev) +$ git merge omap_dss2/for-next +Auto-merging drivers/video/fbdev/mxsfb.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/vendor-prefixes.txt | 1 + + .../devicetree/bindings/video/ssd1307fb.txt | 23 +- + arch/arm/boot/dts/am57xx-beagle-x15.dts | 81 ++++++ + arch/arm/boot/dts/dra7.dtsi | 43 +++ + arch/arm/boot/dts/dra72-evm.dts | 110 ++++++++ + arch/arm/boot/dts/dra72x.dtsi | 11 + + arch/arm/boot/dts/dra74x.dtsi | 15 ++ + arch/arm/boot/dts/dra7xx-clocks.dtsi | 11 + + arch/arm/mach-omap2/display.c | 32 +-- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 33 +++ + drivers/clk/ti/clk-7xx.c | 8 +- + drivers/video/console/newport_con.c | 6 +- + drivers/video/fbdev/Kconfig | 1 + + drivers/video/fbdev/amifb.c | 4 +- + drivers/video/fbdev/atmel_lcdfb.c | 3 +- + drivers/video/fbdev/aty/aty128fb.c | 36 +-- + drivers/video/fbdev/aty/radeon_base.c | 29 +-- + drivers/video/fbdev/aty/radeonfb.h | 2 +- + drivers/video/fbdev/core/Makefile | 2 +- + drivers/video/fbdev/core/fb_defio.c | 2 - + drivers/video/fbdev/gbefb.c | 25 +- + drivers/video/fbdev/geode/gxfb_core.c | 3 +- + drivers/video/fbdev/i810/i810.h | 3 +- + drivers/video/fbdev/i810/i810_main.c | 11 +- + drivers/video/fbdev/i810/i810_main.h | 26 -- + drivers/video/fbdev/intelfb/intelfb.h | 4 +- + drivers/video/fbdev/intelfb/intelfbdrv.c | 38 +-- + drivers/video/fbdev/matrox/matroxfb_base.c | 42 +-- + drivers/video/fbdev/matrox/matroxfb_base.h | 27 +- + drivers/video/fbdev/mxsfb.c | 68 ++++- + drivers/video/fbdev/neofb.c | 26 +- + drivers/video/fbdev/nvidia/nv_type.h | 7 +- + drivers/video/fbdev/nvidia/nvidia.c | 37 +-- + drivers/video/fbdev/omap/Kconfig | 2 +- + .../fbdev/omap2/displays-new/encoder-opa362.c | 12 +- + drivers/video/fbdev/omap2/displays-new/panel-dpi.c | 13 +- + .../omap2/displays-new/panel-lgphilips-lb035q02.c | 7 +- + .../omap2/displays-new/panel-sharp-ls037v7dw01.c | 9 +- + drivers/video/fbdev/omap2/dss/hdmi4_core.c | 12 +- + drivers/video/fbdev/omap2/dss/hdmi5_core.c | 5 +- + drivers/video/fbdev/pm2fb.c | 31 +-- + drivers/video/fbdev/pm3fb.c | 30 +-- + drivers/video/fbdev/riva/fbdev.c | 39 +-- + drivers/video/fbdev/riva/rivafb.h | 4 +- + drivers/video/fbdev/savage/savagefb.h | 4 +- + drivers/video/fbdev/savage/savagefb_driver.c | 17 +- + drivers/video/fbdev/sis/sis.h | 2 +- + drivers/video/fbdev/sis/sis_main.c | 27 +- + drivers/video/fbdev/ssd1307fb.c | 289 +++++++++++++++------ + drivers/video/fbdev/tdfxfb.c | 41 +-- + include/video/neomagic.h | 5 +- + include/video/tdfx.h | 2 +- + sound/soc/omap/omap-hdmi-audio.c | 12 +- + 53 files changed, 762 insertions(+), 571 deletions(-) +Merging regulator/for-next (680f8869c301 Merge remote-tracking branch 'regulator/topic/pwm' into regulator-next) +$ git merge regulator/for-next +Auto-merging drivers/regulator/arizona-ldo1.c +Merge made by the 'recursive' strategy. + .../bindings/regulator/max8973-regulator.txt | 20 +- + .../devicetree/bindings/regulator/regulator.txt | 2 +- + drivers/regulator/88pm8607.c | 2 +- + drivers/regulator/Kconfig | 12 +- + drivers/regulator/Makefile | 1 + + drivers/regulator/arizona-ldo1.c | 15 + + drivers/regulator/core.c | 49 +- + drivers/regulator/da9062-regulator.c | 842 +++++++++++++++++++++ + drivers/regulator/da9063-regulator.c | 21 +- + drivers/regulator/fan53555.c | 1 + + drivers/regulator/helpers.c | 2 +- + drivers/regulator/lp8755.c | 23 +- + drivers/regulator/max14577.c | 128 ++-- + drivers/regulator/max77686.c | 8 +- + drivers/regulator/max77693.c | 17 +- + drivers/regulator/max77843.c | 68 +- + drivers/regulator/max8973-regulator.c | 269 +++++-- + drivers/regulator/of_regulator.c | 4 +- + drivers/regulator/pwm-regulator.c | 41 +- + drivers/regulator/s2mps11.c | 10 +- + drivers/regulator/wm831x-dcdc.c | 12 +- + drivers/regulator/wm831x-isink.c | 3 +- + drivers/regulator/wm831x-ldo.c | 6 +- + include/linux/regulator/max8973-regulator.h | 4 + + 24 files changed, 1265 insertions(+), 295 deletions(-) + create mode 100644 drivers/regulator/da9062-regulator.c +Merging security/next (9fc2b4b436cf selinux: fix setting of security labels on NFS) +$ git merge security/next +Resolved 'include/linux/security.h' using previous resolution. +Resolved 'security/security.c' using previous resolution. +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +CONFLICT (content): Merge conflict in security/security.c +CONFLICT (modify/delete): security/capability.c deleted in security/next and modified in HEAD. Version HEAD of security/capability.c left in tree. +Auto-merging security/apparmor/lsm.c +Auto-merging include/linux/security.h +CONFLICT (content): Merge conflict in include/linux/security.h +Auto-merging include/linux/sched.h +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f security/capability.c +security/capability.c: needs merge +rm 'security/capability.c' +$ git commit -v -a +[master 0c7723f0addb] Merge remote-tracking branch 'security/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/ima_policy | 20 +- + Documentation/kernel-parameters.txt | 2 +- + Documentation/security/Smack.txt | 6 +- + crypto/asymmetric_keys/asymmetric_keys.h | 3 + + crypto/asymmetric_keys/asymmetric_type.c | 20 +- + crypto/asymmetric_keys/x509_public_key.c | 23 +- + fs/xattr.c | 10 +- + include/linux/lsm_hooks.h | 1886 +++++++++++++++++++++++++++++ + include/linux/sched.h | 1 - + include/linux/security.h | 1623 +------------------------ + kernel/signal.c | 13 +- + security/Makefile | 2 +- + security/apparmor/domain.c | 12 +- + security/apparmor/lsm.c | 131 +- + security/capability.c | 1158 ------------------ + security/commoncap.c | 41 +- + security/integrity/digsig.c | 2 +- + security/integrity/evm/evm_main.c | 18 +- + security/integrity/iint.c | 3 + + security/integrity/ima/ima.h | 27 +- + security/integrity/ima/ima_api.c | 20 +- + security/integrity/ima/ima_appraise.c | 8 +- + security/integrity/ima/ima_init.c | 13 +- + security/integrity/ima/ima_main.c | 5 +- + security/integrity/ima/ima_policy.c | 18 +- + security/integrity/ima/ima_template_lib.c | 71 +- + security/integrity/ima/ima_template_lib.h | 22 +- + security/integrity/integrity.h | 2 +- + security/security.c | 955 ++++++++++----- + security/selinux/hooks.c | 567 ++++----- + security/selinux/include/classmap.h | 44 +- + security/selinux/include/security.h | 1 + + security/smack/smack.h | 27 +- + security/smack/smack_access.c | 68 +- + security/smack/smack_lsm.c | 403 +++--- + security/smack/smackfs.c | 313 +++-- + security/tomoyo/tomoyo.c | 72 +- + security/yama/yama_lsm.c | 60 +- + 38 files changed, 3615 insertions(+), 4055 deletions(-) + create mode 100644 include/linux/lsm_hooks.h + delete mode 100644 security/capability.c +$ git am -3 ../patches/0001-LSM-merge-fix-for-follow_link-API-changes.patch +Applying: LSM: merge fix for follow_link API changes +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/lsm_hooks.h +$ git add -A . +$ git commit -v -a --amend +[master cba9d3218a2e] Merge remote-tracking branch 'security/next' + Date: Thu Jun 11 14:22:17 2015 +1000 +Merging integrity/next (8d94eb9b5cff ima: pass iint to ima_add_violation()) +$ git merge integrity/next +Already up-to-date. +Merging selinux/next (9fc2b4b436cf selinux: fix setting of security labels on NFS) +$ git merge selinux/next +Already up-to-date. +Merging lblnet/next (b2776bf7149b Linux 3.18) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (e72cb910fd8d watchdog: da9062: DA9062 watchdog driver) +$ git merge watchdog/master +Resolved 'drivers/watchdog/Kconfig' using previous resolution. +Resolved 'drivers/watchdog/st_lpc_wdt.c' using previous resolution. +Auto-merging drivers/watchdog/st_lpc_wdt.c +CONFLICT (add/add): Merge conflict in drivers/watchdog/st_lpc_wdt.c +Auto-merging drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 19363599bdfc] Merge remote-tracking branch 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/watchdog/digicolor-wdt.txt | 25 ++ + .../devicetree/bindings/watchdog/omap-wdt.txt | 9 +- + drivers/watchdog/Kconfig | 25 +- + drivers/watchdog/Makefile | 2 + + drivers/watchdog/at91sam9_wdt.c | 4 +- + drivers/watchdog/da9062_wdt.c | 253 +++++++++++++++++++++ + drivers/watchdog/digicolor_wdt.c | 205 +++++++++++++++++ + drivers/watchdog/dw_wdt.c | 8 +- + drivers/watchdog/imgpdc_wdt.c | 84 +++++-- + drivers/watchdog/imx2_wdt.c | 3 + + drivers/watchdog/max63xx_wdt.c | 2 +- + drivers/watchdog/mena21_wdt.c | 5 +- + drivers/watchdog/omap_wdt.c | 73 +++--- + drivers/watchdog/st_lpc_wdt.c | 2 +- + 14 files changed, 629 insertions(+), 71 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/digicolor-wdt.txt + create mode 100644 drivers/watchdog/da9062_wdt.c + create mode 100644 drivers/watchdog/digicolor_wdt.c +Merging iommu/next (05eb388bbe39 Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'x86/vt-d', 'x86/amd', 'default-domains' and 'core' into next) +$ git merge iommu/next +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/iommu/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iommu/arm,smmu-v3.txt | 37 + + MAINTAINERS | 3 +- + drivers/iommu/Kconfig | 13 + + drivers/iommu/Makefile | 1 + + drivers/iommu/amd_iommu.c | 576 ++--- + drivers/iommu/amd_iommu_init.c | 34 +- + drivers/iommu/amd_iommu_proto.h | 2 +- + drivers/iommu/amd_iommu_types.h | 11 - + drivers/iommu/arm-smmu-v3.c | 2670 ++++++++++++++++++++ + drivers/iommu/arm-smmu.c | 23 +- + drivers/iommu/dmar.c | 26 +- + drivers/iommu/exynos-iommu.c | 527 ++-- + drivers/iommu/intel-iommu.c | 470 +++- + drivers/iommu/intel_irq_remapping.c | 223 +- + drivers/iommu/iommu.c | 371 ++- + drivers/iommu/iova.c | 4 + + drivers/iommu/rockchip-iommu.c | 27 +- + drivers/vfio/Kconfig | 2 +- + include/linux/intel-iommu.h | 7 + + include/linux/iommu.h | 44 + + 20 files changed, 4163 insertions(+), 908 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt + create mode 100644 drivers/iommu/arm-smmu-v3.c +Merging dwmw2-iommu/master (4ed6a540fab8 iommu/vt-d: Fix passthrough mode with translation-disabled devices) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (20f300175a1e vfio/pci: Fix racy vfio_device_get_from_dev() call) +$ git merge vfio/next +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci.c | 16 +++++++++------- + drivers/vfio/vfio.c | 27 +++++++++++++++++++-------- + 2 files changed, 28 insertions(+), 15 deletions(-) +Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (f8785d94fc4e Merge branch 'doc/4.2' into docs-next) +$ git merge jc_docs/docs-next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/filesystems/vfs.txt +Auto-merging Documentation/filesystems/porting +Auto-merging Documentation/DMA-API-HOWTO.txt +Merge made by the 'recursive' strategy. + Documentation/CodingStyle | 2 +- + Documentation/DMA-API-HOWTO.txt | 4 +- + Documentation/DocBook/kernel-hacking.tmpl | 2 + + Documentation/SubmittingPatches | 4 +- + Documentation/arm/Samsung/Bootloader-interface.txt | 53 ++++++++++++++++++++++ + Documentation/blackfin/gptimers-example.c | 14 ++++-- + Documentation/cpu-freq/governors.txt | 2 +- + Documentation/cpu-freq/intel-pstate.txt | 21 +++++---- + Documentation/features/arch-support.txt | 11 +++++ + .../features/core/BPF-JIT/arch-support.txt | 40 ++++++++++++++++ + .../core/generic-idle-thread/arch-support.txt | 40 ++++++++++++++++ + .../features/core/jump-labels/arch-support.txt | 40 ++++++++++++++++ + .../features/core/tracehook/arch-support.txt | 40 ++++++++++++++++ + .../features/debug/KASAN/arch-support.txt | 40 ++++++++++++++++ + .../debug/gcov-profile-all/arch-support.txt | 40 ++++++++++++++++ + Documentation/features/debug/kgdb/arch-support.txt | 40 ++++++++++++++++ + .../debug/kprobes-on-ftrace/arch-support.txt | 40 ++++++++++++++++ + .../features/debug/kprobes/arch-support.txt | 40 ++++++++++++++++ + .../features/debug/kretprobes/arch-support.txt | 40 ++++++++++++++++ + .../features/debug/optprobes/arch-support.txt | 40 ++++++++++++++++ + .../features/debug/stackprotector/arch-support.txt | 40 ++++++++++++++++ + .../features/debug/uprobes/arch-support.txt | 40 ++++++++++++++++ + .../debug/user-ret-profiler/arch-support.txt | 40 ++++++++++++++++ + .../features/io/dma-api-debug/arch-support.txt | 40 ++++++++++++++++ + .../features/io/dma-contiguous/arch-support.txt | 40 ++++++++++++++++ + .../features/io/dma_map_attrs/arch-support.txt | 40 ++++++++++++++++ + .../features/io/sg-chain/arch-support.txt | 40 ++++++++++++++++ + .../features/lib/strncasecmp/arch-support.txt | 40 ++++++++++++++++ + Documentation/features/list-arch.sh | 24 ++++++++++ + .../locking/cmpxchg-local/arch-support.txt | 40 ++++++++++++++++ + .../features/locking/lockdep/arch-support.txt | 40 ++++++++++++++++ + .../locking/queued-rwlocks/arch-support.txt | 40 ++++++++++++++++ + .../locking/queued-spinlocks/arch-support.txt | 40 ++++++++++++++++ + .../locking/rwsem-optimized/arch-support.txt | 40 ++++++++++++++++ + .../features/perf/kprobes-event/arch-support.txt | 40 ++++++++++++++++ + .../features/perf/perf-regs/arch-support.txt | 40 ++++++++++++++++ + .../features/perf/perf-stackdump/arch-support.txt | 40 ++++++++++++++++ + .../features/sched/numa-balancing/arch-support.txt | 40 ++++++++++++++++ + .../seccomp/seccomp-filter/arch-support.txt | 40 ++++++++++++++++ + .../time/arch-tick-broadcast/arch-support.txt | 40 ++++++++++++++++ + .../features/time/clockevents/arch-support.txt | 40 ++++++++++++++++ + .../time/context-tracking/arch-support.txt | 40 ++++++++++++++++ + .../features/time/irq-time-acct/arch-support.txt | 40 ++++++++++++++++ + .../time/modern-timekeeping/arch-support.txt | 40 ++++++++++++++++ + .../features/time/virt-cpuacct/arch-support.txt | 40 ++++++++++++++++ + .../features/vm/ELF-ASLR/arch-support.txt | 40 ++++++++++++++++ + .../features/vm/PG_uncached/arch-support.txt | 40 ++++++++++++++++ + Documentation/features/vm/THP/arch-support.txt | 40 ++++++++++++++++ + .../features/vm/huge-vmap/arch-support.txt | 40 ++++++++++++++++ + .../features/vm/ioremap_prot/arch-support.txt | 40 ++++++++++++++++ + .../features/vm/numa-memblock/arch-support.txt | 40 ++++++++++++++++ + .../vm/pmdp_splitting_flush/arch-support.txt | 40 ++++++++++++++++ + .../features/vm/pte_special/arch-support.txt | 40 ++++++++++++++++ + Documentation/filesystems/porting | 8 ++-- + Documentation/filesystems/proc.txt | 3 +- + Documentation/filesystems/vfs.txt | 17 ++++--- + Documentation/gpio/consumer.txt | 2 +- + Documentation/ja_JP/HOWTO | 2 +- + Documentation/kasan.txt | 2 +- + Documentation/kbuild/makefiles.txt | 4 +- + Documentation/kernel-parameters.txt | 2 +- + Documentation/laptops/.gitignore | 1 - + Documentation/laptops/00-INDEX | 2 - + Documentation/laptops/Makefile | 2 +- + Documentation/magic-number.txt | 2 - + .../networking/timestamping/txtimestamp.c | 4 +- + Documentation/nfc/nfc-hci.txt | 2 +- + Documentation/stable_kernel_rules.txt | 19 ++++++-- + Documentation/trace/ftrace.txt | 4 +- + Documentation/usb/usb-serial.txt | 12 +++-- + Documentation/zh_CN/magic-number.txt | 2 - + firmware/README.AddingFirmware | 14 +++++- + tools/Makefile | 14 +++++- + tools/laptop/freefall/Makefile | 17 +++++++ + .../laptops => tools/laptop/freefall}/freefall.c | 0 + 75 files changed, 1930 insertions(+), 62 deletions(-) + create mode 100644 Documentation/arm/Samsung/Bootloader-interface.txt + create mode 100644 Documentation/features/arch-support.txt + create mode 100644 Documentation/features/core/BPF-JIT/arch-support.txt + create mode 100644 Documentation/features/core/generic-idle-thread/arch-support.txt + create mode 100644 Documentation/features/core/jump-labels/arch-support.txt + create mode 100644 Documentation/features/core/tracehook/arch-support.txt + create mode 100644 Documentation/features/debug/KASAN/arch-support.txt + create mode 100644 Documentation/features/debug/gcov-profile-all/arch-support.txt + create mode 100644 Documentation/features/debug/kgdb/arch-support.txt + create mode 100644 Documentation/features/debug/kprobes-on-ftrace/arch-support.txt + create mode 100644 Documentation/features/debug/kprobes/arch-support.txt + create mode 100644 Documentation/features/debug/kretprobes/arch-support.txt + create mode 100644 Documentation/features/debug/optprobes/arch-support.txt + create mode 100644 Documentation/features/debug/stackprotector/arch-support.txt + create mode 100644 Documentation/features/debug/uprobes/arch-support.txt + create mode 100644 Documentation/features/debug/user-ret-profiler/arch-support.txt + create mode 100644 Documentation/features/io/dma-api-debug/arch-support.txt + create mode 100644 Documentation/features/io/dma-contiguous/arch-support.txt + create mode 100644 Documentation/features/io/dma_map_attrs/arch-support.txt + create mode 100644 Documentation/features/io/sg-chain/arch-support.txt + create mode 100644 Documentation/features/lib/strncasecmp/arch-support.txt + create mode 100755 Documentation/features/list-arch.sh + create mode 100644 Documentation/features/locking/cmpxchg-local/arch-support.txt + create mode 100644 Documentation/features/locking/lockdep/arch-support.txt + create mode 100644 Documentation/features/locking/queued-rwlocks/arch-support.txt + create mode 100644 Documentation/features/locking/queued-spinlocks/arch-support.txt + create mode 100644 Documentation/features/locking/rwsem-optimized/arch-support.txt + create mode 100644 Documentation/features/perf/kprobes-event/arch-support.txt + create mode 100644 Documentation/features/perf/perf-regs/arch-support.txt + create mode 100644 Documentation/features/perf/perf-stackdump/arch-support.txt + create mode 100644 Documentation/features/sched/numa-balancing/arch-support.txt + create mode 100644 Documentation/features/seccomp/seccomp-filter/arch-support.txt + create mode 100644 Documentation/features/time/arch-tick-broadcast/arch-support.txt + create mode 100644 Documentation/features/time/clockevents/arch-support.txt + create mode 100644 Documentation/features/time/context-tracking/arch-support.txt + create mode 100644 Documentation/features/time/irq-time-acct/arch-support.txt + create mode 100644 Documentation/features/time/modern-timekeeping/arch-support.txt + create mode 100644 Documentation/features/time/virt-cpuacct/arch-support.txt + create mode 100644 Documentation/features/vm/ELF-ASLR/arch-support.txt + create mode 100644 Documentation/features/vm/PG_uncached/arch-support.txt + create mode 100644 Documentation/features/vm/THP/arch-support.txt + create mode 100644 Documentation/features/vm/huge-vmap/arch-support.txt + create mode 100644 Documentation/features/vm/ioremap_prot/arch-support.txt + create mode 100644 Documentation/features/vm/numa-memblock/arch-support.txt + create mode 100644 Documentation/features/vm/pmdp_splitting_flush/arch-support.txt + create mode 100644 Documentation/features/vm/pte_special/arch-support.txt + create mode 100644 tools/laptop/freefall/Makefile + rename {Documentation/laptops => tools/laptop/freefall}/freefall.c (100%) +Merging trivial/for-next (79ce48df755e lpfc: Grammar s/an negative/a negative/) +$ git merge trivial/for-next +Auto-merging net/bridge/netfilter/ebtables.c +Auto-merging include/uapi/linux/netfilter_bridge/ebtables.h +Auto-merging include/linux/netfilter_bridge/ebtables.h +Auto-merging drivers/usb/serial/Kconfig +Auto-merging drivers/scsi/megaraid/megaraid_sas_fusion.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/lpfc/lpfc_debugfs.c +Auto-merging drivers/scsi/Kconfig +Auto-merging drivers/platform/x86/Kconfig +Auto-merging drivers/isdn/i4l/isdn_net.c +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/arm64/include/asm/kvm_asm.h +Auto-merging arch/arm/include/asm/kvm_asm.h +Merge made by the 'recursive' strategy. + arch/arm/include/asm/kvm_asm.h | 2 +- + arch/arm/lib/lib1funcs.S | 4 ++-- + arch/arm64/include/asm/kvm_asm.h | 2 +- + arch/xtensa/Kconfig | 2 +- + drivers/gpu/drm/radeon/atombios.h | 4 ++-- + drivers/isdn/i4l/isdn_net.c | 2 +- + drivers/platform/x86/Kconfig | 4 ++-- + drivers/rapidio/rio-scan.c | 2 +- + drivers/scsi/Kconfig | 2 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 12 ++++++------ + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +- + drivers/scsi/qla4xxx/ql4_83xx.c | 2 +- + drivers/scsi/qla4xxx/ql4_bsg.c | 2 +- + drivers/usb/serial/Kconfig | 2 +- + include/linux/crc-itu-t.h | 2 +- + include/linux/netfilter_bridge/ebtables.h | 2 +- + include/linux/rio.h | 2 +- + include/uapi/linux/netfilter_bridge/ebtables.h | 2 +- + lib/crc-itu-t.c | 2 +- + net/bridge/netfilter/ebtables.c | 2 +- + 21 files changed, 29 insertions(+), 29 deletions(-) +Merging audit/next (5c1390c9ffda audit: obsolete audit_context check is removed in audit_filter_rules()) +$ git merge audit/next +Resolved 'security/lsm_audit.c' using previous resolution. +Auto-merging security/lsm_audit.c +CONFLICT (content): Merge conflict in security/lsm_audit.c +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9fc5c6a318fe] Merge remote-tracking branch 'audit/next' +$ git diff -M --stat --summary HEAD^.. + kernel/audit.c | 2 +- + kernel/auditsc.c | 4 +--- + security/lsm_audit.c | 2 +- + 3 files changed, 3 insertions(+), 5 deletions(-) +Merging devicetree/devicetree/next (ce32f859646b of/fdt: fix argument name and add comments of unflatten_dt_node()) +$ git merge devicetree/devicetree/next +Auto-merging include/linux/of.h +Auto-merging drivers/of/fdt.c +Auto-merging drivers/of/base.c +Merge made by the 'recursive' strategy. + drivers/of/base.c | 2 +- + drivers/of/fdt.c | 5 ++++- + include/linux/of.h | 5 ++++- + 3 files changed, 9 insertions(+), 3 deletions(-) +Merging dt-rh/for-next (63a4aea55670 of: clean-up unnecessary libfdt include paths) +$ git merge dt-rh/for-next +Auto-merging include/linux/of_fdt.h +Auto-merging include/linux/of.h +Auto-merging drivers/of/fdt.c +Auto-merging arch/powerpc/kernel/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/tps6507x.txt | 0 + arch/arm/boot/compressed/libfdt_env.h | 4 + + arch/mips/cavium-octeon/Makefile | 3 - + arch/mips/mti-sead3/Makefile | 2 - + arch/powerpc/boot/libfdt_env.h | 4 + + arch/powerpc/boot/of.h | 2 + + arch/powerpc/kernel/Makefile | 1 - + drivers/firmware/efi/libstub/Makefile | 2 - + drivers/of/Kconfig | 17 +- + drivers/of/Makefile | 3 - + drivers/of/device.c | 12 + + drivers/of/fdt.c | 6 +- + drivers/of/overlay.c | 6 +- + include/linux/libfdt_env.h | 4 + + include/linux/of.h | 14 +- + include/linux/of_device.h | 7 + + include/linux/of_fdt.h | 2 +- + scripts/dtc/checks.c | 31 +- + scripts/dtc/data.c | 12 +- + scripts/dtc/dtc-lexer.l | 65 +- + scripts/dtc/dtc-lexer.lex.c_shipped | 516 +++--- + scripts/dtc/dtc-parser.tab.c_shipped | 1773 +++++++++----------- + scripts/dtc/dtc-parser.tab.h_shipped | 114 +- + scripts/dtc/dtc-parser.y | 147 +- + scripts/dtc/dtc.c | 14 +- + scripts/dtc/dtc.h | 18 +- + scripts/dtc/flattree.c | 4 +- + scripts/dtc/fstree.c | 17 +- + scripts/dtc/libfdt/Makefile.libfdt | 3 +- + scripts/dtc/libfdt/fdt.c | 30 +- + scripts/dtc/libfdt/fdt.h | 93 +- + scripts/dtc/libfdt/fdt_empty_tree.c | 1 + + scripts/dtc/libfdt/fdt_ro.c | 29 +- + scripts/dtc/libfdt/fdt_rw.c | 10 +- + scripts/dtc/libfdt/fdt_sw.c | 36 +- + scripts/dtc/libfdt/fdt_wip.c | 2 +- + scripts/dtc/libfdt/libfdt.h | 148 +- + scripts/dtc/libfdt/libfdt_env.h | 104 +- + scripts/dtc/libfdt/libfdt_internal.h | 6 +- + scripts/dtc/livetree.c | 4 +- + scripts/dtc/srcpos.c | 49 +- + scripts/dtc/srcpos.h | 15 +- + scripts/dtc/treesource.c | 15 +- + scripts/dtc/update-dtc-source.sh | 9 + + scripts/dtc/util.c | 18 +- + scripts/dtc/util.h | 4 +- + scripts/dtc/version_gen.h | 2 +- + 47 files changed, 1812 insertions(+), 1566 deletions(-) + mode change 100755 => 100644 Documentation/devicetree/bindings/mfd/tps6507x.txt +Merging mailbox/mailbox-for-next (a612f89c516e dt: mailbox: Remove 'mbox-names property is discouraged' message from binding) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + .../bindings/mailbox/brcm,bcm2835-mbox.txt | 26 +++ + .../devicetree/bindings/mailbox/mailbox.txt | 10 +- + drivers/mailbox/Kconfig | 10 + + drivers/mailbox/Makefile | 2 + + drivers/mailbox/arm_mhu.c | 2 +- + drivers/mailbox/bcm2835-mailbox.c | 216 +++++++++++++++++++++ + drivers/mailbox/mailbox-altera.c | 2 +- + drivers/mailbox/mailbox.c | 40 +++- + drivers/mailbox/omap-mailbox.c | 8 +- + drivers/mailbox/pcc.c | 2 +- + include/linux/mailbox_client.h | 2 + + include/linux/mailbox_controller.h | 2 +- + 12 files changed, 303 insertions(+), 19 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt + create mode 100644 drivers/mailbox/bcm2835-mailbox.c +Merging spi/for-next (13d24a118211 Merge remote-tracking branches 'spi/topic/sirf' and 'spi/topic/spidev' into spi-next) +$ git merge spi/for-next +Removing drivers/spi/spi-pxa2xx-pxadma.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-ath79.txt | 24 + + .../devicetree/bindings/spi/spi-orion.txt | 8 +- + Documentation/devicetree/bindings/spi/spi-sirf.txt | 3 +- + .../devicetree/bindings/spi/spi_pl022.txt | 2 +- + .../include/asm/mach-ath79/ath79_spi_platform.h | 4 - + drivers/spi/Kconfig | 20 +- + drivers/spi/Makefile | 2 +- + drivers/spi/spi-ath79.c | 34 +- + drivers/spi/spi-atmel.c | 37 +- + drivers/spi/spi-bcm2835.c | 392 ++++++++- + drivers/spi/spi-davinci.c | 2 +- + drivers/spi/spi-fsl-dspi.c | 302 +++++-- + drivers/spi/spi-fsl-espi.c | 6 +- + drivers/spi/spi-imx.c | 2 +- + drivers/spi/spi-omap2-mcspi.c | 280 ++++--- + drivers/spi/spi-orion.c | 70 +- + drivers/spi/spi-pxa2xx-pci.c | 8 +- + drivers/spi/spi-pxa2xx-pxadma.c | 487 ------------ + drivers/spi/spi-pxa2xx.c | 159 ++-- + drivers/spi/spi-pxa2xx.h | 6 +- + drivers/spi/spi-rb4xx.c | 210 +++++ + drivers/spi/spi-rspi.c | 23 +- + drivers/spi/spi-s3c64xx.c | 2 +- + drivers/spi/spi-sh-msiof.c | 2 +- + drivers/spi/spi-sirf.c | 877 +++++++++++++++------ + drivers/spi/spi.c | 45 +- + drivers/spi/spidev.c | 33 +- + include/linux/pxa2xx_ssp.h | 3 +- + 28 files changed, 1868 insertions(+), 1175 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spi-ath79.txt + delete mode 100644 drivers/spi/spi-pxa2xx-pxadma.c + create mode 100644 drivers/spi/spi-rb4xx.c +Merging tip/auto-latest (bdf16a00fad7 Merge branch 'x86/mm') +$ git merge tip/auto-latest +Resolved 'drivers/clocksource/Makefile' using previous resolution. +Resolved 'drivers/iommu/dmar.c' using previous resolution. +Resolved 'drivers/iommu/intel_irq_remapping.c' using previous resolution. +Resolved 'include/linux/intel-iommu.h' using previous resolution. +Resolved 'include/linux/rcupdate.h' using previous resolution. +Removing tools/perf/util/include/linux/poison.h +Auto-merging tools/perf/tests/openat-syscall.c +Auto-merging tools/perf/tests/openat-syscall-tp-fields.c +Auto-merging tools/perf/tests/openat-syscall-all-cpus.c +Auto-merging tools/include/linux/list.h +Auto-merging tools/include/linux/kernel.h +Auto-merging tools/Makefile +Auto-merging net/sched/sch_api.c +Auto-merging net/core/pktgen.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/time/timekeeping.c +Auto-merging kernel/time/tick-common.c +Auto-merging kernel/signal.c +Auto-merging kernel/sched/loadavg.c +Auto-merging kernel/events/core.c +Auto-merging init/Kconfig +Auto-merging include/linux/wait.h +Auto-merging include/linux/tick.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/rcupdate.h +CONFLICT (content): Merge conflict in include/linux/rcupdate.h +Removing include/linux/preempt_mask.h +Removing include/linux/platform_data/irq-renesas-irqc.h +Auto-merging include/linux/perf_event.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/intel-iommu.h +CONFLICT (content): Merge conflict in include/linux/intel-iommu.h +Auto-merging include/linux/compiler.h +Auto-merging drivers/video/fbdev/amifb.c +Auto-merging drivers/power/reset/ltc2952-poweroff.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/net/hyperv/rndis_filter.c +Auto-merging drivers/net/hyperv/netvsc.c +Auto-merging drivers/net/ethernet/sfc/efx.c +Auto-merging drivers/iommu/intel_irq_remapping.c +CONFLICT (content): Merge conflict in drivers/iommu/intel_irq_remapping.c +Auto-merging drivers/iommu/dmar.c +CONFLICT (content): Merge conflict in drivers/iommu/dmar.c +Auto-merging drivers/iommu/amd_iommu_types.h +Auto-merging drivers/iommu/amd_iommu_proto.h +Auto-merging drivers/iommu/amd_iommu_init.c +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/drm_ioctl.c +Auto-merging drivers/cpufreq/intel_pstate.c +Auto-merging drivers/clocksource/timer-integrator-ap.c +Auto-merging drivers/clocksource/Makefile +CONFLICT (content): Merge conflict in drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Removing arch/x86/lib/copy_user_nocache_64.S +Removing arch/x86/kernel/xsave.c +Auto-merging arch/x86/kernel/x86_init.c +Removing arch/x86/kernel/i387.c +Removing arch/x86/kernel/entry_32.S +Removing arch/x86/include/asm/xsave.h +Removing arch/x86/include/asm/xcr.h +Auto-merging arch/x86/include/asm/pci.h +Auto-merging arch/x86/include/asm/msr-index.h +Removing arch/x86/include/asm/i387.h +Removing arch/x86/include/asm/fpu-internal.h +Removing arch/x86/include/asm/dwarf2.h +Removing arch/x86/ia32/ia32entry.S +Auto-merging arch/x86/entry/vsyscall/vsyscall_trace.h +Auto-merging arch/x86/entry/thunk_64.S +Auto-merging arch/x86/entry/thunk_32.S +Auto-merging arch/x86/entry/syscalls/Makefile +Auto-merging arch/x86/entry/syscall_32.c +Auto-merging arch/x86/entry/entry_64.S +Auto-merging arch/x86/entry/calling.h +Auto-merging arch/x86/crypto/sha-mb/sha1_mb.c +Auto-merging arch/x86/crypto/aesni-intel_glue.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/tile/mm/fault.c +Auto-merging arch/tile/include/asm/uaccess.h +Auto-merging arch/mips/include/asm/uaccess.h +Auto-merging arch/arm64/include/asm/io.h +Auto-merging arch/arm/include/asm/io.h +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/x86/kernel-stacks +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f96eec166a48] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-firmware-efi | 10 + + Documentation/ABI/testing/sysfs-firmware-efi-esrt | 81 ++ + Documentation/RCU/arrayRCU.txt | 20 +- + Documentation/RCU/lockdep.txt | 10 - + Documentation/RCU/rcu_dereference.txt | 38 +- + Documentation/RCU/whatisRCU.txt | 6 +- + Documentation/cputopology.txt | 37 +- + .../devicetree/bindings/arm/armv7m_systick.txt | 26 + + .../interrupt-controller/renesas,intc-irqpin.txt | 39 +- + .../bindings/timer/nxp,lpc3220-timer.txt | 26 + + .../devicetree/bindings/timer/st,stm32-timer.txt | 22 + + Documentation/kernel-parameters.txt | 43 +- + Documentation/memory-barriers.txt | 68 +- + Documentation/preempt-locking.txt | 2 +- + Documentation/scheduler/sched-deadline.txt | 184 ++- + Documentation/x86/boot.txt | 3 +- + Documentation/x86/entry_64.txt | 4 +- + Documentation/x86/{x86_64 => }/kernel-stacks | 54 +- + Documentation/x86/mtrr.txt | 18 +- + Documentation/x86/pat.txt | 48 +- + Documentation/x86/x86_64/boot-options.txt | 3 + + Kbuild | 34 +- + MAINTAINERS | 3 +- + Makefile | 5 +- + arch/alpha/include/asm/cmpxchg.h | 2 - + arch/alpha/mm/fault.c | 5 +- + arch/arc/include/asm/futex.h | 10 +- + arch/arc/include/asm/io.h | 1 + + arch/arc/mm/fault.c | 2 +- + arch/arm/include/asm/barrier.h | 2 +- + arch/arm/include/asm/futex.h | 13 +- + arch/arm/include/asm/io.h | 1 + + arch/arm/include/asm/topology.h | 2 +- + arch/arm/mm/fault.c | 2 +- + arch/arm/mm/highmem.c | 3 + + arch/arm64/include/asm/barrier.h | 2 +- + arch/arm64/include/asm/futex.h | 4 +- + arch/arm64/include/asm/io.h | 1 + + arch/arm64/include/asm/topology.h | 2 +- + arch/arm64/mm/fault.c | 2 +- + arch/avr32/include/asm/cmpxchg.h | 2 - + arch/avr32/include/asm/io.h | 1 + + arch/avr32/include/asm/uaccess.h | 12 +- + arch/avr32/mm/fault.c | 4 +- + arch/cris/mm/fault.c | 6 +- + arch/frv/include/asm/io.h | 4 +- + arch/frv/mm/fault.c | 4 +- + arch/frv/mm/highmem.c | 2 + + arch/hexagon/include/asm/cmpxchg.h | 1 - + arch/hexagon/include/asm/uaccess.h | 3 +- + arch/ia64/include/asm/barrier.h | 7 +- + arch/ia64/include/asm/irq_remapping.h | 2 - + arch/ia64/include/asm/topology.h | 2 +- + arch/ia64/include/uapi/asm/cmpxchg.h | 2 - + arch/ia64/kernel/msi_ia64.c | 30 +- + arch/ia64/mm/fault.c | 4 +- + arch/m32r/include/asm/cmpxchg.h | 2 - + arch/m32r/include/asm/io.h | 1 + + arch/m32r/include/asm/uaccess.h | 30 +- + arch/m32r/mm/fault.c | 8 +- + arch/m68k/include/asm/cmpxchg.h | 1 - + arch/m68k/include/asm/io_mm.h | 4 +- + arch/m68k/include/asm/io_no.h | 4 +- + arch/m68k/include/asm/irqflags.h | 3 - + arch/m68k/mm/fault.c | 4 +- + arch/metag/include/asm/barrier.h | 2 +- + arch/metag/include/asm/cmpxchg.h | 2 - + arch/metag/include/asm/io.h | 3 + + arch/metag/mm/fault.c | 2 +- + arch/metag/mm/highmem.c | 4 +- + arch/microblaze/include/asm/io.h | 2 +- + arch/microblaze/include/asm/uaccess.h | 6 +- + arch/microblaze/mm/fault.c | 8 +- + arch/microblaze/mm/highmem.c | 4 +- + arch/mips/include/asm/barrier.h | 4 +- + arch/mips/include/asm/cmpxchg.h | 2 - + arch/mips/include/asm/topology.h | 2 +- + arch/mips/include/asm/uaccess.h | 45 +- + arch/mips/kernel/signal-common.h | 9 +- + arch/mips/mm/fault.c | 4 +- + arch/mips/mm/highmem.c | 5 +- + arch/mips/mm/init.c | 2 + + arch/mn10300/include/asm/highmem.h | 3 + + arch/mn10300/include/asm/io.h | 1 + + arch/mn10300/mm/fault.c | 4 +- + arch/nios2/include/asm/io.h | 1 + + arch/nios2/mm/fault.c | 2 +- + arch/parisc/include/asm/cacheflush.h | 2 + + arch/parisc/include/asm/cmpxchg.h | 2 - + arch/parisc/kernel/traps.c | 4 +- + arch/parisc/mm/fault.c | 4 +- + arch/powerpc/include/asm/barrier.h | 3 +- + arch/powerpc/include/asm/cmpxchg.h | 1 - + arch/powerpc/include/asm/topology.h | 2 +- + arch/powerpc/lib/vmx-helper.c | 11 +- + arch/powerpc/mm/fault.c | 9 +- + arch/powerpc/mm/highmem.c | 4 +- + arch/powerpc/mm/tlb_nohash.c | 2 +- + arch/s390/include/asm/barrier.h | 2 +- + arch/s390/include/asm/cmpxchg.h | 2 - + arch/s390/include/asm/io.h | 1 + + arch/s390/include/asm/timex.h | 5 +- + arch/s390/include/asm/topology.h | 3 +- + arch/s390/include/asm/uaccess.h | 15 +- + arch/s390/kernel/debug.c | 11 +- + arch/s390/kernel/time.c | 6 +- + arch/s390/mm/fault.c | 2 +- + arch/score/include/asm/cmpxchg.h | 2 - + arch/score/include/asm/uaccess.h | 15 +- + arch/score/mm/fault.c | 3 +- + arch/sh/include/asm/barrier.h | 2 +- + arch/sh/include/asm/cmpxchg.h | 2 - + arch/sh/mm/fault.c | 5 +- + arch/sparc/include/asm/barrier_64.h | 4 +- + arch/sparc/include/asm/cmpxchg_32.h | 1 - + arch/sparc/include/asm/cmpxchg_64.h | 2 - + arch/sparc/include/asm/io_32.h | 1 + + arch/sparc/include/asm/io_64.h | 1 + + arch/sparc/include/asm/topology_64.h | 2 +- + arch/sparc/mm/fault_32.c | 4 +- + arch/sparc/mm/fault_64.c | 4 +- + arch/sparc/mm/highmem.c | 4 +- + arch/sparc/mm/init_64.c | 2 +- + arch/tile/include/asm/atomic_64.h | 3 - + arch/tile/include/asm/io.h | 2 +- + arch/tile/include/asm/topology.h | 2 +- + arch/tile/include/asm/uaccess.h | 18 +- + arch/tile/mm/fault.c | 4 +- + arch/tile/mm/highmem.c | 3 +- + arch/um/kernel/trap.c | 5 +- + arch/unicore32/mm/fault.c | 2 +- + arch/x86/Kbuild | 5 +- + arch/x86/Kconfig | 232 ++-- + arch/x86/Kconfig.debug | 23 + + arch/x86/Makefile | 23 +- + arch/x86/crypto/aesni-intel_glue.c | 2 +- + arch/x86/crypto/camellia_aesni_avx2_glue.c | 10 +- + arch/x86/crypto/camellia_aesni_avx_glue.c | 15 +- + arch/x86/crypto/cast5_avx_glue.c | 15 +- + arch/x86/crypto/cast6_avx_glue.c | 15 +- + arch/x86/crypto/crc32-pclmul_glue.c | 2 +- + arch/x86/crypto/crc32c-intel_glue.c | 3 +- + arch/x86/crypto/crct10dif-pclmul_glue.c | 2 +- + arch/x86/crypto/fpu.c | 2 +- + arch/x86/crypto/ghash-clmulni-intel_glue.c | 2 +- + arch/x86/crypto/serpent_avx2_glue.c | 11 +- + arch/x86/crypto/serpent_avx_glue.c | 15 +- + arch/x86/crypto/sha-mb/sha1_mb.c | 5 +- + arch/x86/crypto/sha1_ssse3_glue.c | 16 +- + arch/x86/crypto/sha256_ssse3_glue.c | 16 +- + arch/x86/crypto/sha512_ssse3_glue.c | 16 +- + arch/x86/crypto/twofish_avx_glue.c | 16 +- + arch/x86/entry/Makefile | 10 + + arch/x86/{include/asm => entry}/calling.h | 98 +- + arch/x86/entry/entry_32.S | 1248 +++++++++++++++++ + arch/x86/{kernel => entry}/entry_64.S | 1125 +++++++--------- + arch/x86/entry/entry_64_compat.S | 556 ++++++++ + arch/x86/{kernel => entry}/syscall_32.c | 6 +- + arch/x86/{kernel => entry}/syscall_64.c | 0 + arch/x86/{ => entry}/syscalls/Makefile | 4 +- + arch/x86/{ => entry}/syscalls/syscall_32.tbl | 0 + arch/x86/{ => entry}/syscalls/syscall_64.tbl | 0 + arch/x86/{ => entry}/syscalls/syscallhdr.sh | 0 + arch/x86/{ => entry}/syscalls/syscalltbl.sh | 0 + arch/x86/{lib => entry}/thunk_32.S | 19 +- + arch/x86/{lib => entry}/thunk_64.S | 50 +- + arch/x86/{ => entry}/vdso/.gitignore | 0 + arch/x86/{ => entry}/vdso/Makefile | 0 + arch/x86/{ => entry}/vdso/checkundef.sh | 0 + arch/x86/{ => entry}/vdso/vclock_gettime.c | 0 + arch/x86/{ => entry}/vdso/vdso-layout.lds.S | 0 + arch/x86/{ => entry}/vdso/vdso-note.S | 0 + arch/x86/{ => entry}/vdso/vdso.lds.S | 0 + arch/x86/{ => entry}/vdso/vdso2c.c | 0 + arch/x86/{ => entry}/vdso/vdso2c.h | 0 + arch/x86/{ => entry}/vdso/vdso32-setup.c | 0 + arch/x86/{ => entry}/vdso/vdso32/.gitignore | 0 + arch/x86/{ => entry}/vdso/vdso32/int80.S | 0 + arch/x86/{ => entry}/vdso/vdso32/note.S | 0 + arch/x86/{ => entry}/vdso/vdso32/sigreturn.S | 0 + arch/x86/{ => entry}/vdso/vdso32/syscall.S | 0 + arch/x86/{ => entry}/vdso/vdso32/sysenter.S | 0 + arch/x86/{ => entry}/vdso/vdso32/vclock_gettime.c | 0 + .../{ => entry}/vdso/vdso32/vdso-fakesections.c | 0 + arch/x86/{ => entry}/vdso/vdso32/vdso32.lds.S | 0 + arch/x86/{ => entry}/vdso/vdsox32.lds.S | 0 + arch/x86/{ => entry}/vdso/vgetcpu.c | 0 + arch/x86/{ => entry}/vdso/vma.c | 0 + arch/x86/entry/vsyscall/Makefile | 7 + + arch/x86/{kernel => entry/vsyscall}/vsyscall_64.c | 0 + .../{kernel => entry/vsyscall}/vsyscall_emu_64.S | 0 + .../x86/{kernel => entry/vsyscall}/vsyscall_gtod.c | 0 + .../{kernel => entry/vsyscall}/vsyscall_trace.h | 2 +- + arch/x86/ia32/Makefile | 2 +- + arch/x86/ia32/ia32_signal.c | 13 +- + arch/x86/ia32/ia32entry.S | 611 --------- + arch/x86/include/asm/alternative-asm.h | 18 + + arch/x86/include/asm/alternative.h | 6 + + arch/x86/include/asm/amd_nb.h | 11 + + arch/x86/include/asm/apic.h | 6 + + arch/x86/include/asm/asm.h | 25 + + arch/x86/include/asm/atomic.h | 30 +- + arch/x86/include/asm/atomic64_64.h | 8 +- + arch/x86/include/asm/barrier.h | 4 +- + arch/x86/include/asm/cacheflush.h | 6 +- + arch/x86/include/asm/cmpxchg.h | 2 - + arch/x86/include/asm/crypto/glue_helper.h | 2 +- + arch/x86/include/asm/dma-mapping.h | 46 +- + arch/x86/include/asm/dwarf2.h | 170 --- + arch/x86/include/asm/efi.h | 2 +- + arch/x86/include/asm/entry_arch.h | 5 + + arch/x86/include/asm/fpu-internal.h | 626 --------- + arch/x86/include/asm/fpu/api.h | 48 + + arch/x86/include/asm/fpu/internal.h | 694 ++++++++++ + arch/x86/include/asm/fpu/regset.h | 21 + + arch/x86/include/asm/fpu/signal.h | 33 + + arch/x86/include/asm/fpu/types.h | 293 ++++ + arch/x86/include/asm/fpu/xstate.h | 46 + + arch/x86/include/asm/frame.h | 7 +- + arch/x86/include/asm/hardirq.h | 4 + + arch/x86/include/asm/hpet.h | 16 +- + arch/x86/include/asm/hw_irq.h | 140 +- + arch/x86/include/asm/i387.h | 108 -- + arch/x86/include/asm/io.h | 9 +- + arch/x86/include/asm/io_apic.h | 114 +- + arch/x86/include/asm/irq.h | 4 + + arch/x86/include/asm/irq_remapping.h | 69 +- + arch/x86/include/asm/irq_vectors.h | 51 +- + arch/x86/include/asm/irqdomain.h | 63 + + arch/x86/include/asm/kvm_host.h | 2 - + arch/x86/include/asm/mce.h | 28 +- + arch/x86/include/asm/microcode.h | 8 +- + arch/x86/include/asm/microcode_amd.h | 4 +- + arch/x86/include/asm/microcode_intel.h | 13 +- + arch/x86/include/asm/mmu_context.h | 13 + + arch/x86/include/asm/mpx.h | 74 +- + arch/x86/include/asm/msi.h | 7 + + arch/x86/include/{uapi => }/asm/msr-index.h | 2 + + arch/x86/include/asm/msr.h | 12 +- + arch/x86/include/asm/mtrr.h | 15 +- + arch/x86/include/asm/paravirt.h | 29 +- + arch/x86/include/asm/paravirt_types.h | 17 +- + arch/x86/include/asm/pat.h | 9 +- + arch/x86/include/asm/pci.h | 5 - + arch/x86/include/asm/pgtable.h | 8 +- + arch/x86/include/asm/pgtable_types.h | 3 + + arch/x86/include/asm/preempt.h | 8 +- + arch/x86/include/asm/processor.h | 160 +-- + arch/x86/include/asm/proto.h | 10 +- + arch/x86/include/asm/qspinlock.h | 57 + + arch/x86/include/asm/qspinlock_paravirt.h | 6 + + arch/x86/include/asm/simd.h | 2 +- + arch/x86/include/asm/smp.h | 10 - + arch/x86/include/asm/special_insns.h | 38 + + arch/x86/include/asm/spinlock.h | 5 + + arch/x86/include/asm/spinlock_types.h | 4 + + arch/x86/include/asm/stackprotector.h | 2 + + arch/x86/include/asm/suspend_32.h | 2 +- + arch/x86/include/asm/suspend_64.h | 2 +- + arch/x86/include/asm/thread_info.h | 8 +- + arch/x86/include/asm/topology.h | 4 +- + arch/x86/include/asm/trace/irq_vectors.h | 6 + + arch/x86/include/asm/trace/mpx.h | 132 ++ + arch/x86/include/asm/traps.h | 3 +- + arch/x86/include/asm/uaccess.h | 15 +- + arch/x86/include/asm/uaccess_32.h | 10 +- + arch/x86/include/asm/user.h | 12 +- + arch/x86/include/asm/x86_init.h | 21 - + arch/x86/include/asm/xcr.h | 49 - + arch/x86/include/asm/xor.h | 2 +- + arch/x86/include/asm/xor_32.h | 2 +- + arch/x86/include/asm/xor_avx.h | 2 +- + arch/x86/include/asm/xsave.h | 257 ---- + arch/x86/include/uapi/asm/msr.h | 2 - + arch/x86/include/uapi/asm/mtrr.h | 8 +- + arch/x86/include/uapi/asm/sigcontext.h | 8 +- + arch/x86/kernel/Makefile | 7 +- + arch/x86/kernel/acpi/boot.c | 73 +- + arch/x86/kernel/acpi/wakeup_64.S | 6 +- + arch/x86/kernel/alternative.c | 14 + + arch/x86/kernel/amd_nb.c | 4 +- + arch/x86/kernel/apb_timer.c | 4 - + arch/x86/kernel/aperture_64.c | 8 +- + arch/x86/kernel/apic/htirq.c | 173 ++- + arch/x86/kernel/apic/io_apic.c | 1303 +++++++++--------- + arch/x86/kernel/apic/msi.c | 417 +++--- + arch/x86/kernel/apic/vector.c | 448 ++++--- + arch/x86/kernel/apic/x2apic_phys.c | 2 + + arch/x86/kernel/asm-offsets.c | 21 + + arch/x86/kernel/asm-offsets_32.c | 18 - + arch/x86/kernel/asm-offsets_64.c | 23 +- + arch/x86/kernel/cpu/amd.c | 18 +- + arch/x86/kernel/cpu/bugs.c | 55 +- + arch/x86/kernel/cpu/common.c | 90 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 8 +- + arch/x86/kernel/cpu/mcheck/mce.c | 65 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 141 +- + arch/x86/kernel/cpu/mcheck/mce_intel.c | 44 + + arch/x86/kernel/cpu/microcode/amd_early.c | 24 +- + arch/x86/kernel/cpu/microcode/core.c | 76 +- + arch/x86/kernel/cpu/microcode/core_early.c | 26 +- + arch/x86/kernel/cpu/microcode/intel.c | 79 +- + arch/x86/kernel/cpu/microcode/intel_early.c | 42 +- + arch/x86/kernel/cpu/microcode/intel_lib.c | 45 +- + arch/x86/kernel/cpu/mshyperv.c | 6 +- + arch/x86/kernel/cpu/mtrr/cleanup.c | 3 +- + arch/x86/kernel/cpu/mtrr/generic.c | 209 ++- + arch/x86/kernel/cpu/mtrr/main.c | 48 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 2 +- + arch/x86/kernel/cpu/perf_event.c | 20 +- + arch/x86/kernel/cpu/perf_event.h | 21 +- + arch/x86/kernel/cpu/perf_event_intel.c | 230 ++-- + arch/x86/kernel/cpu/perf_event_intel_cqm.c | 108 +- + arch/x86/kernel/cpu/perf_event_intel_ds.c | 317 +++-- + arch/x86/kernel/cpu/perf_event_intel_lbr.c | 13 +- + arch/x86/kernel/cpu/perf_event_intel_pt.c | 38 +- + arch/x86/kernel/cpu/perf_event_intel_rapl.c | 5 +- + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 17 +- + arch/x86/kernel/cpu/perf_event_intel_uncore.h | 19 +- + arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 20 + + .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 6 +- + arch/x86/kernel/cpu/proc.c | 3 +- + arch/x86/kernel/crash.c | 1 + + arch/x86/kernel/devicetree.c | 41 +- + arch/x86/kernel/entry_32.S | 1401 -------------------- + arch/x86/kernel/fpu/Makefile | 5 + + arch/x86/kernel/fpu/bugs.c | 71 + + arch/x86/kernel/fpu/core.c | 523 ++++++++ + arch/x86/kernel/fpu/init.c | 354 +++++ + arch/x86/kernel/fpu/regset.c | 356 +++++ + arch/x86/kernel/fpu/signal.c | 404 ++++++ + arch/x86/kernel/fpu/xstate.c | 461 +++++++ + arch/x86/kernel/head_32.S | 4 +- + arch/x86/kernel/head_64.S | 4 +- + arch/x86/kernel/hpet.c | 57 +- + arch/x86/kernel/i386_ksyms_32.c | 4 +- + arch/x86/kernel/i387.c | 671 ---------- + arch/x86/kernel/i8259.c | 8 +- + arch/x86/kernel/irq.c | 62 +- + arch/x86/kernel/irq_32.c | 6 - + arch/x86/kernel/irq_64.c | 6 - + arch/x86/kernel/irq_work.c | 10 +- + arch/x86/kernel/irqinit.c | 10 +- + arch/x86/kernel/kvm.c | 43 + + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/mpparse.c | 7 +- + arch/x86/kernel/paravirt-spinlocks.c | 24 +- + arch/x86/kernel/paravirt.c | 4 +- + arch/x86/kernel/paravirt_patch_32.c | 22 +- + arch/x86/kernel/paravirt_patch_64.c | 23 +- + arch/x86/kernel/pci-dma.c | 45 + + arch/x86/kernel/process.c | 61 +- + arch/x86/kernel/process_32.c | 20 +- + arch/x86/kernel/process_64.c | 16 +- + arch/x86/kernel/ptrace.c | 12 +- + arch/x86/kernel/setup.c | 10 +- + arch/x86/kernel/signal.c | 38 +- + arch/x86/kernel/smp.c | 19 +- + arch/x86/kernel/smpboot.c | 88 +- + arch/x86/kernel/traps.c | 155 +-- + arch/x86/kernel/tsc_sync.c | 2 +- + arch/x86/kernel/uprobes.c | 10 +- + arch/x86/kernel/x8664_ksyms_64.c | 4 +- + arch/x86/kernel/x86_init.c | 9 - + arch/x86/kernel/xsave.c | 724 ---------- + arch/x86/kvm/cpuid.c | 4 +- + arch/x86/kvm/vmx.c | 5 +- + arch/x86/kvm/x86.c | 68 +- + arch/x86/lguest/boot.c | 6 +- + arch/x86/lib/Makefile | 3 +- + arch/x86/lib/atomic64_386_32.S | 7 +- + arch/x86/lib/atomic64_cx8_32.S | 61 +- + arch/x86/lib/checksum_32.S | 52 +- + arch/x86/lib/clear_page_64.S | 7 - + arch/x86/lib/cmpxchg16b_emu.S | 12 +- + arch/x86/lib/cmpxchg8b_emu.S | 11 +- + arch/x86/lib/copy_page_64.S | 11 - + arch/x86/lib/copy_user_64.S | 127 +- + arch/x86/lib/copy_user_nocache_64.S | 136 -- + arch/x86/lib/csum-copy_64.S | 17 - + arch/x86/lib/getuser.S | 13 - + arch/x86/lib/iomap_copy_64.S | 3 - + arch/x86/lib/memcpy_64.S | 3 - + arch/x86/lib/memmove_64.S | 3 - + arch/x86/lib/memset_64.S | 5 - + arch/x86/lib/mmx_32.c | 2 +- + arch/x86/lib/msr-reg.S | 44 +- + arch/x86/lib/putuser.S | 8 +- + arch/x86/lib/rwsem.S | 49 +- + arch/x86/lib/usercopy_32.c | 6 +- + arch/x86/math-emu/fpu_aux.c | 4 +- + arch/x86/math-emu/fpu_entry.c | 20 +- + arch/x86/math-emu/fpu_system.h | 2 +- + arch/x86/mm/fault.c | 5 +- + arch/x86/mm/highmem_32.c | 3 +- + arch/x86/mm/init.c | 6 +- + arch/x86/mm/iomap_32.c | 14 +- + arch/x86/mm/ioremap.c | 78 +- + arch/x86/mm/mpx.c | 519 +++++--- + arch/x86/mm/pageattr-test.c | 1 + + arch/x86/mm/pageattr.c | 84 +- + arch/x86/mm/pat.c | 337 +++-- + arch/x86/mm/pat_internal.h | 2 +- + arch/x86/mm/pat_rbtree.c | 6 +- + arch/x86/mm/pgtable.c | 60 +- + arch/x86/net/bpf_jit.S | 1 - + arch/x86/pci/i386.c | 6 +- + arch/x86/pci/intel_mid_pci.c | 6 +- + arch/x86/pci/irq.c | 13 +- + arch/x86/platform/Makefile | 1 + + arch/x86/platform/atom/Makefile | 1 + + arch/x86/platform/atom/punit_atom_debug.c | 183 +++ + arch/x86/platform/efi/efi.c | 2 + + .../platform/intel-mid/device_libs/platform_wdt.c | 5 +- + arch/x86/platform/intel-mid/intel-mid.c | 18 +- + arch/x86/platform/intel-mid/sfi.c | 30 +- + arch/x86/platform/sfi/sfi.c | 7 +- + arch/x86/platform/uv/uv_irq.c | 298 ++--- + arch/x86/power/cpu.c | 11 +- + arch/x86/power/hibernate_asm_64.S | 8 +- + arch/x86/um/Makefile | 2 +- + arch/x86/um/asm/barrier.h | 3 +- + arch/x86/xen/enlighten.c | 10 +- + arch/x86/xen/p2m.c | 1 + + arch/x86/xen/spinlock.c | 64 +- + arch/x86/xen/xen-asm_64.S | 28 +- + arch/x86/xen/xen-ops.h | 2 + + arch/xtensa/include/asm/io.h | 1 + + arch/xtensa/mm/fault.c | 4 +- + arch/xtensa/mm/highmem.c | 2 + + block/blk-mq-cpumap.c | 2 +- + drivers/acpi/acpi_pad.c | 2 +- + drivers/acpi/apei/erst.c | 1 + + drivers/base/topology.c | 2 +- + drivers/block/pmem.c | 4 +- + drivers/char/hw_random/via-rng.c | 2 +- + drivers/clocksource/Kconfig | 17 + + drivers/clocksource/Makefile | 3 + + drivers/clocksource/armv7m_systick.c | 79 ++ + drivers/clocksource/asm9260_timer.c | 2 +- + drivers/clocksource/exynos_mct.c | 22 +- + drivers/clocksource/qcom-timer.c | 59 - + drivers/clocksource/time-lpc32xx.c | 272 ++++ + drivers/clocksource/timer-integrator-ap.c | 2 +- + drivers/clocksource/timer-stm32.c | 184 +++ + drivers/clocksource/timer-sun5i.c | 2 +- + drivers/cpufreq/acpi-cpufreq.c | 5 +- + drivers/cpufreq/intel_pstate.c | 1 + + drivers/cpufreq/p4-clockmod.c | 2 +- + drivers/cpufreq/powernow-k8.c | 13 +- + drivers/cpufreq/speedstep-ich.c | 2 +- + drivers/crypto/padlock-aes.c | 2 +- + drivers/crypto/padlock-sha.c | 2 +- + drivers/crypto/vmx/aes.c | 8 +- + drivers/crypto/vmx/aes_cbc.c | 6 + + drivers/crypto/vmx/ghash.c | 8 + + drivers/dma/mic_x100_dma.c | 1 + + drivers/firmware/efi/Makefile | 2 +- + drivers/firmware/efi/efi.c | 91 +- + drivers/firmware/efi/efivars.c | 11 +- + drivers/firmware/efi/esrt.c | 471 +++++++ + drivers/gpu/drm/drm_ioctl.c | 14 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 +- + drivers/hwmon/coretemp.c | 3 +- + drivers/iommu/amd_iommu.c | 477 ++++--- + drivers/iommu/amd_iommu_init.c | 4 + + drivers/iommu/amd_iommu_proto.h | 9 + + drivers/iommu/amd_iommu_types.h | 5 + + drivers/iommu/dmar.c | 19 +- + drivers/iommu/intel_irq_remapping.c | 573 ++++---- + drivers/iommu/irq_remapping.c | 242 +--- + drivers/iommu/irq_remapping.h | 36 +- + drivers/irqchip/exynos-combiner.c | 2 +- + drivers/irqchip/irq-armada-370-xp.c | 2 +- + drivers/irqchip/irq-bcm2835.c | 2 +- + drivers/irqchip/irq-gic-common.c | 17 - + drivers/irqchip/irq-gic-v3.c | 1 + + drivers/irqchip/irq-gic.c | 1 + + drivers/irqchip/irq-hip04.c | 1 + + drivers/irqchip/irq-keystone.c | 2 +- + drivers/irqchip/irq-mips-gic.c | 2 +- + drivers/irqchip/irq-mtk-sysirq.c | 4 +- + drivers/irqchip/irq-mxs.c | 2 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 2 +- + drivers/irqchip/irq-renesas-irqc.c | 19 +- + drivers/irqchip/irq-s3c24xx.c | 4 +- + drivers/irqchip/irq-sun4i.c | 2 +- + drivers/irqchip/irq-sunxi-nmi.c | 2 +- + drivers/irqchip/irq-versatile-fpga.c | 2 +- + drivers/irqchip/irq-vf610-mscm-ir.c | 5 +- + drivers/irqchip/irq-vic.c | 2 +- + drivers/irqchip/irq-vt8500.c | 2 +- + drivers/lguest/interrupts_and_traps.c | 10 +- + drivers/lguest/x86/core.c | 12 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/hyperv/netvsc.c | 1 + + drivers/net/hyperv/rndis_filter.c | 1 + + drivers/pci/htirq.c | 48 +- + drivers/pci/quirks.c | 7 - + drivers/power/reset/ltc2952-poweroff.c | 1 - + drivers/scsi/fnic/fnic_debugfs.c | 1 + + drivers/scsi/fnic/fnic_trace.c | 1 + + .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 4 +- + drivers/video/fbdev/amifb.c | 4 +- + drivers/video/fbdev/atafb.c | 3 +- + drivers/video/fbdev/hpfb.c | 4 +- + fs/select.c | 6 +- + include/asm-generic/barrier.h | 4 +- + include/asm-generic/cmpxchg.h | 3 - + include/asm-generic/futex.h | 7 +- + include/asm-generic/io.h | 17 + + include/asm-generic/iomap.h | 4 + + include/asm-generic/pgtable.h | 4 + + include/asm-generic/preempt.h | 7 +- + include/asm-generic/qspinlock.h | 139 ++ + include/asm-generic/qspinlock_types.h | 79 ++ + include/linux/alarmtimer.h | 4 +- + include/linux/bottom_half.h | 1 - + include/linux/clockchips.h | 37 +- + include/linux/clocksource.h | 1 - + include/linux/compiler.h | 20 +- + include/linux/context_tracking.h | 10 - + include/linux/context_tracking_state.h | 1 + + include/linux/dmar.h | 3 +- + include/linux/efi.h | 8 + + include/linux/hardirq.h | 2 +- + include/linux/highmem.h | 2 + + include/linux/hrtimer.h | 118 +- + include/linux/htirq.h | 22 +- + include/linux/init_task.h | 5 +- + include/linux/intel-iommu.h | 4 + + include/linux/interrupt.h | 9 +- + include/linux/io-mapping.h | 2 + + include/linux/io.h | 8 + + include/linux/irq.h | 6 + + include/linux/jiffies.h | 75 +- + include/linux/kernel.h | 3 +- + include/linux/osq_lock.h | 5 + + include/linux/perf_event.h | 46 +- + include/linux/platform_data/irq-renesas-irqc.h | 27 - + include/linux/preempt.h | 159 ++- + include/linux/preempt_mask.h | 117 -- + include/linux/rculist.h | 10 +- + include/linux/rcupdate.h | 74 +- + include/linux/rcutiny.h | 16 + + include/linux/rcutree.h | 9 +- + include/linux/sched.h | 136 +- + include/linux/spinlock.h | 2 +- + include/linux/tick.h | 7 + + include/linux/time64.h | 1 + + include/linux/timekeeper_internal.h | 17 + + include/linux/timekeeping.h | 2 +- + include/linux/timer.h | 7 - + include/linux/timerqueue.h | 8 +- + include/linux/topology.h | 6 +- + include/linux/uaccess.h | 48 +- + include/linux/wait.h | 17 +- + include/trace/events/sched.h | 3 +- + include/trace/events/timer.h | 13 +- + include/uapi/linux/perf_event.h | 14 + + init/Kconfig | 74 +- + ipc/mqueue.c | 54 +- + kernel/Kconfig.locks | 13 +- + kernel/context_tracking.c | 67 +- + kernel/cpu.c | 4 +- + kernel/events/core.c | 156 ++- + kernel/events/internal.h | 9 - + kernel/events/ring_buffer.c | 2 +- + kernel/fork.c | 8 +- + kernel/futex.c | 40 +- + kernel/irq/chip.c | 14 + + kernel/irq/devres.c | 4 +- + kernel/irq/dummychip.c | 1 + + kernel/irq/irqdesc.c | 4 +- + kernel/irq/manage.c | 31 + + kernel/irq/msi.c | 2 +- + kernel/irq/pm.c | 4 + + kernel/locking/Makefile | 3 +- + kernel/locking/lockdep.c | 6 +- + kernel/locking/lockdep_proc.c | 22 +- + kernel/locking/locktorture.c | 14 +- + kernel/locking/mcs_spinlock.h | 1 + + kernel/locking/qrwlock.c | 2 +- + kernel/locking/qspinlock.c | 473 +++++++ + kernel/locking/qspinlock_paravirt.h | 325 +++++ + kernel/locking/rtmutex.c | 18 +- + kernel/locking/rwsem-xadd.c | 44 + + kernel/rcu/rcutorture.c | 103 +- + kernel/rcu/srcu.c | 10 +- + kernel/rcu/tiny.c | 38 +- + kernel/rcu/tiny_plugin.h | 12 +- + kernel/rcu/tree.c | 365 ++--- + kernel/rcu/tree.h | 35 +- + kernel/rcu/tree_plugin.h | 230 ++-- + kernel/rcu/tree_trace.c | 6 +- + kernel/rcu/update.c | 30 +- + kernel/sched/Makefile | 2 +- + kernel/sched/auto_group.c | 6 +- + kernel/sched/auto_group.h | 2 +- + kernel/sched/core.c | 146 +- + kernel/sched/cputime.c | 2 +- + kernel/sched/deadline.c | 14 +- + kernel/sched/debug.c | 2 - + kernel/sched/fair.c | 448 +++++-- + kernel/sched/{proc.c => loadavg.c} | 236 +--- + kernel/sched/rt.c | 24 +- + kernel/sched/sched.h | 17 +- + kernel/sched/stats.h | 15 +- + kernel/sched/wait.c | 8 +- + kernel/signal.c | 6 +- + kernel/sys.c | 8 +- + kernel/time/Makefile | 17 +- + kernel/time/alarmtimer.c | 17 +- + kernel/time/clockevents.c | 67 +- + kernel/time/hrtimer.c | 551 +++----- + kernel/time/posix-cpu-timers.c | 87 +- + kernel/time/posix-timers.c | 17 +- + kernel/time/tick-broadcast-hrtimer.c | 18 +- + kernel/time/tick-broadcast.c | 97 +- + kernel/time/tick-common.c | 18 +- + kernel/time/tick-internal.h | 17 +- + kernel/time/tick-oneshot.c | 22 +- + kernel/time/tick-sched.c | 297 ++--- + kernel/time/tick-sched.h | 2 +- + kernel/time/time.c | 65 +- + kernel/time/timeconst.bc | 3 +- + kernel/time/timekeeping.c | 119 +- + kernel/time/timekeeping.h | 11 +- + kernel/time/timer.c | 83 +- + kernel/time/timer_list.c | 49 +- + kernel/torture.c | 26 +- + lib/Kconfig.debug | 66 +- + lib/cpu_rmap.c | 2 +- + lib/radix-tree.c | 2 +- + lib/raid6/x86.h | 2 +- + lib/strnlen_user.c | 6 +- + lib/timerqueue.c | 10 +- + mm/memory.c | 18 +- + net/core/pktgen.c | 2 - + net/sched/sch_api.c | 5 +- + scripts/checksyscalls.sh | 2 +- + sound/core/hrtimer.c | 9 +- + sound/drivers/pcsp/pcsp.c | 17 +- + sound/pci/asihpi/hpioctl.c | 1 + + tools/Makefile | 20 +- + tools/arch/alpha/include/asm/barrier.h | 8 + + tools/arch/arm/include/asm/barrier.h | 12 + + tools/arch/arm64/include/asm/barrier.h | 16 + + tools/arch/ia64/include/asm/barrier.h | 48 + + tools/arch/mips/include/asm/barrier.h | 20 + + tools/arch/powerpc/include/asm/barrier.h | 29 + + tools/arch/s390/include/asm/barrier.h | 30 + + tools/arch/sh/include/asm/barrier.h | 32 + + tools/arch/sparc/include/asm/barrier.h | 8 + + tools/arch/sparc/include/asm/barrier_32.h | 6 + + tools/arch/sparc/include/asm/barrier_64.h | 42 + + tools/arch/tile/include/asm/barrier.h | 15 + + tools/arch/x86/include/asm/atomic.h | 65 + + tools/arch/x86/include/asm/barrier.h | 28 + + tools/arch/x86/include/asm/rmwcc.h | 41 + + tools/arch/xtensa/include/asm/barrier.h | 18 + + tools/build/Makefile.build | 2 +- + tools/build/Makefile.feature | 4 +- + tools/build/tests/ex/Build | 1 + + tools/build/tests/ex/empty2/README | 2 + + tools/include/asm-generic/atomic-gcc.h | 63 + + tools/include/asm-generic/barrier.h | 44 + + tools/include/asm/atomic.h | 10 + + tools/include/asm/barrier.h | 27 + + tools/include/linux/atomic.h | 6 + + tools/include/linux/compiler.h | 4 + + tools/{perf/util => }/include/linux/kernel.h | 4 +- + tools/{perf/util => }/include/linux/list.h | 6 +- + tools/include/linux/poison.h | 1 + + tools/include/linux/types.h | 8 + + tools/lib/traceevent/.gitignore | 1 + + tools/lib/traceevent/Makefile | 34 +- + tools/lib/traceevent/event-parse.c | 6 +- + tools/lib/traceevent/event-parse.h | 1 + + tools/lib/traceevent/plugin_cfg80211.c | 13 + + .../callchain-overhead-calculation.txt | 108 ++ + tools/perf/Documentation/perf-bench.txt | 3 + + tools/perf/Documentation/perf-inject.txt | 27 + + tools/perf/Documentation/perf-kmem.txt | 11 +- + tools/perf/Documentation/perf-probe.txt | 17 +- + tools/perf/Documentation/perf-record.txt | 12 +- + tools/perf/Documentation/perf-report.txt | 35 +- + tools/perf/Documentation/perf-script.txt | 37 +- + tools/perf/Documentation/perf-top.txt | 3 +- + tools/perf/Documentation/perf-trace.txt | 2 +- + tools/perf/MANIFEST | 22 + + tools/perf/Makefile.perf | 22 +- + tools/perf/arch/arm64/Build | 1 + + tools/perf/arch/arm64/include/perf_regs.h | 3 + + tools/perf/arch/arm64/tests/Build | 2 + + tools/perf/arch/arm64/tests/dwarf-unwind.c | 61 + + tools/perf/arch/arm64/tests/regs_load.S | 46 + + tools/perf/arch/common.c | 2 +- + tools/perf/arch/powerpc/util/Build | 1 + + tools/perf/arch/powerpc/util/sym-handling.c | 82 ++ + tools/perf/bench/Build | 1 + + tools/perf/bench/bench.h | 2 + + tools/perf/bench/futex-wake-parallel.c | 294 ++++ + tools/perf/bench/futex-wake.c | 7 +- + tools/perf/bench/numa.c | 33 +- + tools/perf/builtin-annotate.c | 17 +- + tools/perf/builtin-bench.c | 1 + + tools/perf/builtin-buildid-list.c | 9 + + tools/perf/builtin-diff.c | 9 +- + tools/perf/builtin-inject.c | 175 ++- + tools/perf/builtin-kmem.c | 988 ++++++++++++-- + tools/perf/builtin-kvm.c | 6 +- + tools/perf/builtin-lock.c | 8 +- + tools/perf/builtin-mem.c | 5 +- + tools/perf/builtin-probe.c | 195 ++- + tools/perf/builtin-record.c | 369 ++++-- + tools/perf/builtin-report.c | 47 +- + tools/perf/builtin-sched.c | 159 ++- + tools/perf/builtin-script.c | 94 +- + tools/perf/builtin-stat.c | 466 +------ + tools/perf/builtin-timechart.c | 9 +- + tools/perf/builtin-top.c | 9 +- + tools/perf/builtin-trace.c | 75 +- + tools/perf/config/Makefile | 13 +- + tools/perf/config/utilities.mak | 19 + + tools/perf/perf-sys.h | 73 +- + tools/perf/perf.h | 5 + + tools/perf/tests/Build | 8 +- + tools/perf/tests/builtin-test.c | 16 +- + tools/perf/tests/code-reading.c | 24 +- + tools/perf/tests/dso-data.c | 15 +- + tools/perf/tests/dwarf-unwind.c | 1 + + tools/perf/tests/evsel-roundtrip-name.c | 4 +- + tools/perf/tests/hists_common.c | 10 +- + tools/perf/tests/hists_cumulate.c | 10 +- + tools/perf/tests/hists_filter.c | 12 +- + tools/perf/tests/hists_link.c | 12 +- + tools/perf/tests/hists_output.c | 10 +- + tools/perf/tests/keep-tracking.c | 4 +- + tools/perf/tests/kmod-path.c | 72 + + tools/perf/tests/make | 18 +- + tools/perf/tests/mmap-basic.c | 6 +- + tools/perf/tests/mmap-thread-lookup.c | 2 + + ...yscall-all-cpus.c => openat-syscall-all-cpus.c} | 12 +- + ...call-tp-fields.c => openat-syscall-tp-fields.c} | 6 +- + .../tests/{open-syscall.c => openat-syscall.c} | 14 +- + tools/perf/tests/parse-events.c | 14 +- + tools/perf/tests/perf-time-to-tsc.c | 2 +- + tools/perf/tests/pmu.c | 3 +- + tools/perf/tests/switch-tracking.c | 8 +- + tools/perf/tests/tests.h | 17 +- + tools/perf/tests/thread-mg-share.c | 41 +- + tools/perf/tests/vmlinux-kallsyms.c | 34 +- + tools/perf/ui/browsers/annotate.c | 4 + + tools/perf/ui/browsers/hists.c | 637 +++++---- + tools/perf/ui/tui/setup.c | 2 +- + tools/perf/util/Build | 13 +- + tools/perf/util/annotate.c | 21 +- + tools/perf/util/auxtrace.c | 1352 +++++++++++++++++++ + tools/perf/util/auxtrace.h | 643 +++++++++ + tools/perf/util/build-id.c | 64 +- + tools/perf/util/cache.h | 1 - + tools/perf/util/callchain.h | 4 + + tools/perf/util/cgroup.c | 10 +- + tools/perf/util/cgroup.h | 4 +- + tools/perf/util/comm.c | 13 +- + tools/perf/util/data-convert-bt.c | 410 +++++- + tools/perf/util/db-export.c | 31 +- + tools/perf/util/dso.c | 334 +++-- + tools/perf/util/dso.h | 47 +- + tools/perf/util/dwarf-aux.c | 220 ++- + tools/perf/util/dwarf-aux.h | 13 +- + tools/perf/util/environment.c | 1 - + tools/perf/util/event.c | 73 +- + tools/perf/util/event.h | 89 ++ + tools/perf/util/evlist.c | 85 +- + tools/perf/util/evlist.h | 11 +- + tools/perf/util/evsel.c | 5 +- + tools/perf/util/evsel.h | 4 +- + tools/perf/util/header.c | 52 +- + tools/perf/util/header.h | 1 + + tools/perf/util/hist.c | 26 +- + tools/perf/util/hist.h | 1 - + tools/perf/util/include/linux/poison.h | 1 - + tools/perf/util/include/linux/rbtree.h | 14 + + tools/perf/util/machine.c | 253 +++- + tools/perf/util/machine.h | 20 +- + tools/perf/util/map.c | 241 ++-- + tools/perf/util/map.h | 44 +- + tools/perf/util/pager.c | 5 - + tools/perf/util/parse-branch-options.c | 94 ++ + tools/perf/util/parse-branch-options.h | 5 + + tools/perf/util/parse-events.c | 196 ++- + tools/perf/util/parse-events.h | 42 +- + tools/perf/util/parse-events.l | 41 +- + tools/perf/util/parse-events.y | 50 +- + tools/perf/util/parse-options.h | 4 + + tools/perf/util/pmu.c | 72 +- + tools/perf/util/pmu.h | 6 +- + tools/perf/util/probe-event.c | 472 ++++--- + tools/perf/util/probe-event.h | 26 +- + tools/perf/util/probe-finder.c | 165 ++- + tools/perf/util/probe-finder.h | 10 +- + tools/perf/util/pstack.c | 7 + + tools/perf/util/pstack.h | 1 + + tools/perf/util/record.c | 15 +- + tools/perf/util/session.c | 209 ++- + tools/perf/util/session.h | 6 + + tools/perf/util/sort.c | 4 +- + tools/perf/util/sort.h | 38 +- + tools/perf/util/stat-shadow.c | 434 ++++++ + tools/perf/util/stat.c | 35 +- + tools/perf/util/stat.h | 40 + + tools/perf/util/strfilter.c | 107 ++ + tools/perf/util/strfilter.h | 35 + + tools/perf/util/symbol-elf.c | 23 +- + tools/perf/util/symbol.c | 117 +- + tools/perf/util/symbol.h | 12 +- + tools/perf/util/thread.c | 12 +- + tools/perf/util/thread.h | 5 +- + tools/perf/util/tool.h | 13 +- + tools/perf/util/trace-event-parse.c | 2 +- + tools/perf/util/unwind-libunwind.c | 11 +- + tools/perf/util/util.c | 81 +- + tools/perf/util/util.h | 6 + + tools/perf/util/vdso.c | 60 +- + tools/perf/util/vdso.h | 4 +- + tools/power/x86/turbostat/Makefile | 2 +- + .../testing/selftests/rcutorture/bin/configinit.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 4 + + tools/testing/selftests/rcutorture/bin/kvm.sh | 25 +- + .../selftests/rcutorture/configs/rcu/CFcommon | 2 + + .../selftests/rcutorture/configs/rcu/SRCU-N | 1 + + .../selftests/rcutorture/configs/rcu/SRCU-P | 1 + + .../selftests/rcutorture/configs/rcu/SRCU-P.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TASKS01 | 5 +- + .../selftests/rcutorture/configs/rcu/TASKS02 | 1 - + .../selftests/rcutorture/configs/rcu/TASKS03 | 2 +- + .../selftests/rcutorture/configs/rcu/TINY02 | 2 +- + .../selftests/rcutorture/configs/rcu/TINY02.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE01 | 1 + + .../selftests/rcutorture/configs/rcu/TREE02 | 2 +- + .../selftests/rcutorture/configs/rcu/TREE02-T | 1 - + .../selftests/rcutorture/configs/rcu/TREE03 | 8 +- + .../selftests/rcutorture/configs/rcu/TREE03.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE04 | 8 +- + .../selftests/rcutorture/configs/rcu/TREE05 | 4 +- + .../selftests/rcutorture/configs/rcu/TREE06 | 4 +- + .../selftests/rcutorture/configs/rcu/TREE06.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE07 | 4 +- + .../selftests/rcutorture/configs/rcu/TREE08 | 6 +- + .../selftests/rcutorture/configs/rcu/TREE08-T | 1 - + .../selftests/rcutorture/configs/rcu/TREE08-T.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE08.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE09 | 1 + + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 36 +- + tools/testing/selftests/x86/Makefile | 5 +- + tools/testing/selftests/x86/sysret_ss_attrs.c | 112 ++ + tools/testing/selftests/x86/thunks.S | 67 + + 860 files changed, 27311 insertions(+), 15817 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-firmware-efi-esrt + create mode 100644 Documentation/devicetree/bindings/arm/armv7m_systick.txt + create mode 100644 Documentation/devicetree/bindings/timer/nxp,lpc3220-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/st,stm32-timer.txt + rename Documentation/x86/{x86_64 => }/kernel-stacks (68%) + create mode 100644 arch/x86/entry/Makefile + rename arch/x86/{include/asm => entry}/calling.h (80%) + create mode 100644 arch/x86/entry/entry_32.S + rename arch/x86/{kernel => entry}/entry_64.S (58%) + create mode 100644 arch/x86/entry/entry_64_compat.S + rename arch/x86/{kernel => entry}/syscall_32.c (79%) + rename arch/x86/{kernel => entry}/syscall_64.c (100%) + rename arch/x86/{ => entry}/syscalls/Makefile (95%) + rename arch/x86/{ => entry}/syscalls/syscall_32.tbl (100%) + rename arch/x86/{ => entry}/syscalls/syscall_64.tbl (100%) + rename arch/x86/{ => entry}/syscalls/syscallhdr.sh (100%) + rename arch/x86/{ => entry}/syscalls/syscalltbl.sh (100%) + rename arch/x86/{lib => entry}/thunk_32.S (74%) + rename arch/x86/{lib => entry}/thunk_64.S (66%) + rename arch/x86/{ => entry}/vdso/.gitignore (100%) + rename arch/x86/{ => entry}/vdso/Makefile (100%) + rename arch/x86/{ => entry}/vdso/checkundef.sh (100%) + rename arch/x86/{ => entry}/vdso/vclock_gettime.c (100%) + rename arch/x86/{ => entry}/vdso/vdso-layout.lds.S (100%) + rename arch/x86/{ => entry}/vdso/vdso-note.S (100%) + rename arch/x86/{ => entry}/vdso/vdso.lds.S (100%) + rename arch/x86/{ => entry}/vdso/vdso2c.c (100%) + rename arch/x86/{ => entry}/vdso/vdso2c.h (100%) + rename arch/x86/{ => entry}/vdso/vdso32-setup.c (100%) + rename arch/x86/{ => entry}/vdso/vdso32/.gitignore (100%) + rename arch/x86/{ => entry}/vdso/vdso32/int80.S (100%) + rename arch/x86/{ => entry}/vdso/vdso32/note.S (100%) + rename arch/x86/{ => entry}/vdso/vdso32/sigreturn.S (100%) + rename arch/x86/{ => entry}/vdso/vdso32/syscall.S (100%) + rename arch/x86/{ => entry}/vdso/vdso32/sysenter.S (100%) + rename arch/x86/{ => entry}/vdso/vdso32/vclock_gettime.c (100%) + rename arch/x86/{ => entry}/vdso/vdso32/vdso-fakesections.c (100%) + rename arch/x86/{ => entry}/vdso/vdso32/vdso32.lds.S (100%) + rename arch/x86/{ => entry}/vdso/vdsox32.lds.S (100%) + rename arch/x86/{ => entry}/vdso/vgetcpu.c (100%) + rename arch/x86/{ => entry}/vdso/vma.c (100%) + create mode 100644 arch/x86/entry/vsyscall/Makefile + rename arch/x86/{kernel => entry/vsyscall}/vsyscall_64.c (100%) + rename arch/x86/{kernel => entry/vsyscall}/vsyscall_emu_64.S (100%) + rename arch/x86/{kernel => entry/vsyscall}/vsyscall_gtod.c (100%) + rename arch/x86/{kernel => entry/vsyscall}/vsyscall_trace.h (89%) + delete mode 100644 arch/x86/ia32/ia32entry.S + delete mode 100644 arch/x86/include/asm/dwarf2.h + delete mode 100644 arch/x86/include/asm/fpu-internal.h + create mode 100644 arch/x86/include/asm/fpu/api.h + create mode 100644 arch/x86/include/asm/fpu/internal.h + create mode 100644 arch/x86/include/asm/fpu/regset.h + create mode 100644 arch/x86/include/asm/fpu/signal.h + create mode 100644 arch/x86/include/asm/fpu/types.h + create mode 100644 arch/x86/include/asm/fpu/xstate.h + delete mode 100644 arch/x86/include/asm/i387.h + create mode 100644 arch/x86/include/asm/irqdomain.h + create mode 100644 arch/x86/include/asm/msi.h + rename arch/x86/include/{uapi => }/asm/msr-index.h (99%) + create mode 100644 arch/x86/include/asm/qspinlock.h + create mode 100644 arch/x86/include/asm/qspinlock_paravirt.h + create mode 100644 arch/x86/include/asm/trace/mpx.h + delete mode 100644 arch/x86/include/asm/xcr.h + delete mode 100644 arch/x86/include/asm/xsave.h + delete mode 100644 arch/x86/kernel/entry_32.S + create mode 100644 arch/x86/kernel/fpu/Makefile + create mode 100644 arch/x86/kernel/fpu/bugs.c + create mode 100644 arch/x86/kernel/fpu/core.c + create mode 100644 arch/x86/kernel/fpu/init.c + create mode 100644 arch/x86/kernel/fpu/regset.c + create mode 100644 arch/x86/kernel/fpu/signal.c + create mode 100644 arch/x86/kernel/fpu/xstate.c + delete mode 100644 arch/x86/kernel/i387.c + delete mode 100644 arch/x86/kernel/xsave.c + delete mode 100644 arch/x86/lib/copy_user_nocache_64.S + create mode 100644 arch/x86/platform/atom/Makefile + create mode 100644 arch/x86/platform/atom/punit_atom_debug.c + create mode 100644 drivers/clocksource/armv7m_systick.c + create mode 100644 drivers/clocksource/time-lpc32xx.c + create mode 100644 drivers/clocksource/timer-stm32.c + create mode 100644 drivers/firmware/efi/esrt.c + create mode 100644 include/asm-generic/qspinlock.h + create mode 100644 include/asm-generic/qspinlock_types.h + delete mode 100644 include/linux/platform_data/irq-renesas-irqc.h + delete mode 100644 include/linux/preempt_mask.h + create mode 100644 kernel/locking/qspinlock.c + create mode 100644 kernel/locking/qspinlock_paravirt.h + rename kernel/sched/{proc.c => loadavg.c} (62%) + create mode 100644 tools/arch/alpha/include/asm/barrier.h + create mode 100644 tools/arch/arm/include/asm/barrier.h + create mode 100644 tools/arch/arm64/include/asm/barrier.h + create mode 100644 tools/arch/ia64/include/asm/barrier.h + create mode 100644 tools/arch/mips/include/asm/barrier.h + create mode 100644 tools/arch/powerpc/include/asm/barrier.h + create mode 100644 tools/arch/s390/include/asm/barrier.h + create mode 100644 tools/arch/sh/include/asm/barrier.h + create mode 100644 tools/arch/sparc/include/asm/barrier.h + create mode 100644 tools/arch/sparc/include/asm/barrier_32.h + create mode 100644 tools/arch/sparc/include/asm/barrier_64.h + create mode 100644 tools/arch/tile/include/asm/barrier.h + create mode 100644 tools/arch/x86/include/asm/atomic.h + create mode 100644 tools/arch/x86/include/asm/barrier.h + create mode 100644 tools/arch/x86/include/asm/rmwcc.h + create mode 100644 tools/arch/xtensa/include/asm/barrier.h + create mode 100644 tools/build/tests/ex/empty2/README + create mode 100644 tools/include/asm-generic/atomic-gcc.h + create mode 100644 tools/include/asm-generic/barrier.h + create mode 100644 tools/include/asm/atomic.h + create mode 100644 tools/include/asm/barrier.h + create mode 100644 tools/include/linux/atomic.h + rename tools/{perf/util => }/include/linux/kernel.h (97%) + rename tools/{perf/util => }/include/linux/list.h (90%) + create mode 100644 tools/include/linux/poison.h + create mode 100644 tools/perf/Documentation/callchain-overhead-calculation.txt + create mode 100644 tools/perf/arch/arm64/tests/Build + create mode 100644 tools/perf/arch/arm64/tests/dwarf-unwind.c + create mode 100644 tools/perf/arch/arm64/tests/regs_load.S + create mode 100644 tools/perf/arch/powerpc/util/sym-handling.c + create mode 100644 tools/perf/bench/futex-wake-parallel.c + rename tools/perf/tests/{open-syscall-all-cpus.c => openat-syscall-all-cpus.c} (90%) + rename tools/perf/tests/{open-syscall-tp-fields.c => openat-syscall-tp-fields.c} (94%) + rename tools/perf/tests/{open-syscall.c => openat-syscall.c} (79%) + create mode 100644 tools/perf/util/auxtrace.c + create mode 100644 tools/perf/util/auxtrace.h + delete mode 100644 tools/perf/util/include/linux/poison.h + create mode 100644 tools/perf/util/parse-branch-options.c + create mode 100644 tools/perf/util/parse-branch-options.h + create mode 100644 tools/perf/util/stat-shadow.c + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE03.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot + create mode 100644 tools/testing/selftests/x86/sysret_ss_attrs.c + create mode 100644 tools/testing/selftests/x86/thunks.S +$ git am -3 ../patches/0001-rcu-merge-fix-for-Convert-ACCESS_ONCE-to-READ_ONCE-a.patch +Applying: rcu: merge fix for Convert ACCESS_ONCE() to READ_ONCE() and WRITE_ONCE() +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/compiler.h +$ git add -A . +$ git commit -v -a --amend +[master 91a0428c5a5e] Merge remote-tracking branch 'tip/auto-latest' + Date: Thu Jun 11 15:06:09 2015 +1000 +Merging clockevents/clockevents/next (645d558b1cd5 Merge branch 'clockevents/4.2' into clockevents/next) +$ git merge clockevents/clockevents/next +Resolved 'drivers/clocksource/Makefile' using previous resolution. +Resolved 'drivers/clocksource/timer-stm32.c' using previous resolution. +Auto-merging drivers/clocksource/timer-stm32.c +CONFLICT (add/add): Merge conflict in drivers/clocksource/timer-stm32.c +Auto-merging drivers/clocksource/Makefile +CONFLICT (content): Merge conflict in drivers/clocksource/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f2f0331a7fd9] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +Merging edac/linux_next (fa2ce64f85be sb_edac: support for Broadwell -EP and -EX) +$ git merge edac/linux_next +Merge made by the 'recursive' strategy. + drivers/edac/edac_mc_sysfs.c | 5 - + drivers/edac/sb_edac.c | 215 +++++++++++++++++++++++++------------------ + 2 files changed, 125 insertions(+), 95 deletions(-) +Merging edac-amd/for-next (31fec261002e EDAC, altera: Do not allow suspend when EDAC is enabled) +$ git merge edac-amd/for-next +Recorded preimage for 'arch/arm64/boot/dts/apm/apm-storm.dtsi' +Resolved 'arch/tile/Kconfig' using previous resolution. +Resolved 'arch/x86/Kconfig' using previous resolution. +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Removing arch/tile/include/asm/edac.h +Auto-merging arch/tile/Kconfig +CONFLICT (content): Merge conflict in arch/tile/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apm/apm-storm.dtsi +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/boot/dts/socfpga_arria10.dtsi +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm64/boot/dts/apm/apm-storm.dtsi'. +[master e3a4d71fd4c7] Merge remote-tracking branch 'edac-amd/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/arm/altera/socfpga-sdram-edac.txt | 2 +- + .../devicetree/bindings/edac/apm-xgene-edac.txt | 79 ++ + MAINTAINERS | 17 +- + arch/arm/Kconfig | 2 + + arch/arm/boot/dts/socfpga_arria10.dtsi | 11 + + arch/arm/include/asm/edac.h | 5 +- + arch/arm64/Kconfig | 1 + + arch/arm64/boot/dts/apm/apm-storm.dtsi | 83 ++ + arch/mips/Kconfig | 1 + + arch/mips/include/asm/edac.h | 4 +- + arch/powerpc/Kconfig | 2 + + arch/powerpc/include/asm/edac.h | 4 +- + arch/tile/Kconfig | 1 + + arch/tile/include/asm/edac.h | 29 - + arch/x86/Kconfig | 2 + + arch/x86/include/asm/edac.h | 2 +- + drivers/edac/Kconfig | 22 +- + drivers/edac/Makefile | 1 + + drivers/edac/altera_edac.c | 381 +++--- + drivers/edac/altera_edac.h | 201 ++++ + drivers/edac/edac_mc.c | 9 +- + drivers/edac/edac_stub.c | 1 - + drivers/edac/mce_amd_inj.c | 207 +++- + drivers/edac/mpc85xx_edac.c | 10 +- + drivers/edac/mpc85xx_edac.h | 1 + + drivers/edac/xgene_edac.c | 1215 ++++++++++++++++++++ + 26 files changed, 2070 insertions(+), 223 deletions(-) + create mode 100644 Documentation/devicetree/bindings/edac/apm-xgene-edac.txt + delete mode 100644 arch/tile/include/asm/edac.h + create mode 100644 drivers/edac/altera_edac.h + create mode 100644 drivers/edac/xgene_edac.c +Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge tiny/tiny/next +Already up-to-date. +Merging ftrace/for-next (a497adb45b86 ring-buffer: Add enum names for the context levels) +$ git merge ftrace/for-next +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/rcu/tiny.c +Auto-merging kernel/module.c +Auto-merging kernel/events/core.c +Auto-merging include/trace/trace_events.h +Auto-merging include/trace/events/power.h +Auto-merging include/linux/trace_events.h +Auto-merging include/linux/perf_event.h +Auto-merging include/linux/module.h +Auto-merging include/linux/kernel.h +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Merge made by the 'recursive' strategy. + arch/x86/kvm/mmutrace.h | 2 +- + arch/x86/kvm/svm.c | 2 +- + arch/x86/kvm/vmx.c | 2 +- + include/linux/kernel.h | 6 - + include/linux/module.h | 2 +- + include/linux/perf_event.h | 2 +- + include/linux/syscalls.h | 12 +- + include/linux/{ftrace_event.h => trace_events.h} | 177 +++++---- + include/trace/define_trace.h | 3 +- + include/trace/events/power.h | 2 +- + include/trace/perf.h | 350 +++++++++++++++++ + include/trace/syscall.h | 6 +- + include/trace/{ftrace.h => trace_events.h} | 413 ++------------------- + kernel/events/core.c | 2 +- + kernel/module.c | 2 +- + kernel/rcu/tiny.c | 2 +- + kernel/rcu/tree.c | 2 +- + kernel/trace/blktrace.c | 4 +- + kernel/trace/ring_buffer.c | 221 +++++------ + kernel/trace/trace.c | 23 +- + kernel/trace/trace.h | 42 +-- + kernel/trace/trace_branch.c | 4 +- + kernel/trace/trace_clock.c | 3 + + kernel/trace/trace_event_perf.c | 20 +- + kernel/trace/trace_events.c | 304 +++++++-------- + kernel/trace/trace_events_filter.c | 86 ++--- + kernel/trace/trace_events_trigger.c | 70 ++-- + kernel/trace/trace_export.c | 10 +- + kernel/trace/trace_functions_graph.c | 8 +- + kernel/trace/trace_kprobe.c | 70 ++-- + kernel/trace/trace_mmiotrace.c | 4 +- + kernel/trace/trace_output.c | 78 ++-- + kernel/trace/trace_output.h | 2 +- + kernel/trace/trace_probe.h | 8 +- + kernel/trace/trace_sched_wakeup.c | 4 +- + kernel/trace/trace_syscalls.c | 72 ++-- + kernel/trace/trace_uprobe.c | 46 +-- + mm/debug.c | 2 +- + .../perf/util/scripting-engines/trace-event-perl.c | 4 +- + .../util/scripting-engines/trace-event-python.c | 4 +- + 40 files changed, 1010 insertions(+), 1066 deletions(-) + rename include/linux/{ftrace_event.h => trace_events.h} (76%) + create mode 100644 include/trace/perf.h + rename include/trace/{ftrace.h => trace_events.h} (51%) +Merging rcu/rcu/next (66709041ffca cpu: Wait for RCU grace periods concurrently) +$ git merge rcu/rcu/next +Auto-merging kernel/rcu/tree_plugin.h +Auto-merging kernel/rcu/tree.c +Auto-merging init/Kconfig +Auto-merging include/linux/types.h +Auto-merging include/linux/rcutree.h +Auto-merging include/linux/rcupdate.h +Auto-merging arch/arm/kernel/smp.c +Auto-merging Documentation/memory-barriers.txt +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/RCU/rcu_dereference.txt | 2 +- + Documentation/kernel-parameters.txt | 35 ++++--- + Documentation/memory-barriers.txt | 2 +- + arch/arm/kernel/smp.c | 6 +- + include/linux/rcupdate.h | 81 +++++++-------- + include/linux/rcutiny.h | 10 ++ + include/linux/rcutree.h | 2 + + include/linux/types.h | 3 + + init/Kconfig | 10 +- + kernel/cpu.c | 10 +- + kernel/rcu/rcutorture.c | 21 ++-- + kernel/rcu/srcu.c | 5 +- + kernel/rcu/tree.c | 180 +++++++++++++++++++++------------- + kernel/rcu/tree.h | 39 ++++---- + kernel/rcu/tree_plugin.h | 7 +- + kernel/rcu/update.c | 86 ++++++++++++++-- + kernel/time/Kconfig | 2 - + 17 files changed, 315 insertions(+), 186 deletions(-) +Merging kvm/linux-next (e80a4a9426ad KVM: x86: mark legacy PCI device assignment as deprecated) +$ git merge kvm/linux-next +Resolved 'arch/x86/include/asm/kvm_host.h' using previous resolution. +Resolved 'arch/x86/kvm/x86.c' using previous resolution. +Auto-merging arch/x86/kvm/x86.c +CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/kvm/mmu_audit.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kernel/kvm.c +Auto-merging arch/x86/include/asm/kvm_host.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm_host.h +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/kvm/interrupt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master be0c8b9025e9] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 69 ++- + Documentation/virtual/kvm/mmu.txt | 6 + + arch/arm/kvm/arm.c | 4 +- + arch/arm/kvm/mmu.c | 10 +- + arch/mips/include/asm/kvm_host.h | 2 +- + arch/mips/kvm/mips.c | 13 +- + arch/powerpc/include/asm/kvm_book3s_64.h | 2 +- + arch/powerpc/include/asm/kvm_host.h | 2 +- + arch/powerpc/include/asm/kvm_ppc.h | 14 +- + arch/powerpc/kvm/book3s.c | 9 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 2 +- + arch/powerpc/kvm/book3s_hv.c | 15 +- + arch/powerpc/kvm/book3s_pr.c | 11 +- + arch/powerpc/kvm/booke.c | 13 +- + arch/powerpc/kvm/powerpc.c | 9 +- + arch/s390/include/asm/kvm_host.h | 6 +- + arch/s390/kernel/entry.S | 2 +- + arch/s390/kvm/intercept.c | 16 - + arch/s390/kvm/interrupt.c | 87 ++-- + arch/s390/kvm/kvm-s390.c | 81 ++-- + arch/s390/kvm/kvm-s390.h | 25 +- + arch/s390/kvm/priv.c | 8 +- + arch/x86/include/asm/kvm_emulate.h | 9 +- + arch/x86/include/asm/kvm_host.h | 61 ++- + arch/x86/include/asm/pvclock-abi.h | 1 + + arch/x86/include/asm/pvclock.h | 1 - + arch/x86/include/uapi/asm/kvm.h | 14 +- + arch/x86/kernel/kvm.c | 4 +- + arch/x86/kernel/kvmclock.c | 14 +- + arch/x86/kvm/Kconfig | 9 +- + arch/x86/kvm/cpuid.c | 9 +- + arch/x86/kvm/cpuid.h | 8 + + arch/x86/kvm/emulate.c | 303 ++++++++++++- + arch/x86/kvm/ioapic.c | 9 +- + arch/x86/kvm/irq_comm.c | 14 +- + arch/x86/kvm/kvm_cache_regs.h | 5 + + arch/x86/kvm/lapic.c | 59 ++- + arch/x86/kvm/lapic.h | 15 +- + arch/x86/kvm/mmu.c | 581 +++++++++++++----------- + arch/x86/kvm/mmu.h | 2 + + arch/x86/kvm/mmu_audit.c | 20 +- + arch/x86/kvm/paging_tmpl.h | 18 +- + arch/x86/kvm/svm.c | 105 +++-- + arch/x86/kvm/trace.h | 22 + + arch/x86/kvm/vmx.c | 328 ++++++++++---- + arch/x86/kvm/x86.c | 729 ++++++++++++++++++++++++++----- + arch/x86/kvm/x86.h | 2 + + include/linux/kvm_host.h | 96 +++- + include/linux/kvm_types.h | 1 + + include/uapi/linux/kvm.h | 7 +- + virt/kvm/kvm_main.c | 432 ++++++++++++------ + 51 files changed, 2380 insertions(+), 904 deletions(-) +$ git am -3 ../patches/0001-kvm-bad-merge-fix-patch-for-arch-x86-kvm-cpuid.c.patch +Applying: kvm: bad merge fix patch for arch/x86/kvm/cpuid.c +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/kvm/cpuid.c +$ git add -A . +$ git commit -v -a --amend +[master 672e17f3fb6e] Merge remote-tracking branch 'kvm/linux-next' + Date: Thu Jun 11 15:59:46 2015 +1000 +Merging kvm-arm/next (3520469d65f2 KVM: export __gfn_to_pfn_memslot, drop gfn_to_pfn_async) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (b79013b2449c Merge tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (ea2cdd27dce6 KVM: s390: introduce KMSG_COMPONENT for kvm-s390) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (ffb7dbed47da xen/arm: Define xen_arch_suspend()) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying()) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (402dd89d6cdb workqueue: fix typos in comments) +$ git merge workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'recursive' strategy. + Documentation/workqueue.txt | 2 +- + include/linux/workqueue.h | 31 ++- + kernel/workqueue.c | 484 +++++++++++++++++++++++++++++--------------- + 3 files changed, 353 insertions(+), 164 deletions(-) +Merging drivers-x86/for-next (9330dcdd918a samsung-laptop: Use acpi_video_unregister_backlight instead of acpi_video_unregister) +$ git merge drivers-x86/for-next +Resolved 'drivers/platform/x86/ideapad-laptop.c' using previous resolution. +Auto-merging drivers/platform/x86/ideapad-laptop.c +CONFLICT (content): Merge conflict in drivers/platform/x86/ideapad-laptop.c +Auto-merging drivers/platform/x86/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 09024da648a3] Merge remote-tracking branch 'drivers-x86/for-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-driver-toshiba_haps | 20 ++ + drivers/platform/x86/Kconfig | 2 +- + drivers/platform/x86/apple-gmux.c | 2 +- + drivers/platform/x86/asus-wmi.c | 346 +++++++++++++++++++-- + drivers/platform/x86/ideapad-laptop.c | 7 + + drivers/platform/x86/pvpanic.c | 10 +- + drivers/platform/x86/samsung-laptop.c | 4 +- + drivers/platform/x86/toshiba_acpi.c | 246 +++------------ + drivers/platform/x86/toshiba_bluetooth.c | 174 ++++++++--- + drivers/platform/x86/toshiba_haps.c | 32 +- + 10 files changed, 564 insertions(+), 279 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-toshiba_haps +Merging chrome-platform/for-next (96cba9b00e29 platform/chrome: chromeos_laptop - instantiate Atmel at primary address) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging regmap/for-next (385faaeab062 Merge remote-tracking branches 'regmap/topic/defaults', 'regmap/topic/irq' and 'regmap/topic/reg-params' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/internal.h | 3 +++ + drivers/base/regmap/regcache.c | 45 ++++++++++++++++++++++++++-------------- + drivers/base/regmap/regmap-irq.c | 11 ++-------- + drivers/base/regmap/regmap.c | 27 +++++++++++++++++++++--- + include/linux/regmap.h | 14 +++++++++++++ + 5 files changed, 73 insertions(+), 27 deletions(-) +Merging hsi/for-next (1269594a93bb HSI: nokia-modem: use flags argument of devm_gpiod_get to set direction) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/clients/cmt_speech.c | 9 +++++++-- + drivers/hsi/clients/nokia-modem.c | 11 ++++------- + include/uapi/linux/hsi/cs-protocol.h | 16 +++++++++++----- + 3 files changed, 22 insertions(+), 14 deletions(-) +Merging leds/for-next (589fca16c14a leds: add BCM6358 LED driver) +$ git merge leds/for-next +Auto-merging drivers/leds/led-class.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-aat1290.txt | 41 + + .../devicetree/bindings/leds/leds-bcm6328.txt | 309 +++++++ + .../devicetree/bindings/leds/leds-bcm6358.txt | 145 +++ + .../devicetree/bindings/leds/leds-ktd2692.txt | 50 ++ + .../devicetree/bindings/leds/leds-tlc591xx.txt | 40 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/leds/leds-lp5523.txt | 30 + + drivers/leds/Kconfig | 53 +- + drivers/leds/Makefile | 6 + + drivers/leds/led-class.c | 5 + + drivers/leds/led-core.c | 5 +- + drivers/leds/leds-aat1290.c | 451 ++++++++++ + drivers/leds/leds-bcm6328.c | 413 +++++++++ + drivers/leds/leds-bcm6358.c | 243 +++++ + drivers/leds/leds-gpio.c | 12 +- + drivers/leds/leds-ktd2692.c | 443 ++++++++++ + drivers/leds/leds-lp5523.c | 148 ++++ + drivers/leds/leds-max77693.c | 980 +++++++++++++++++++++ + drivers/leds/leds-tlc591xx.c | 300 +++++++ + drivers/leds/leds.h | 24 - + include/linux/gpio/consumer.h | 15 + + include/linux/leds.h | 25 + + 22 files changed, 3708 insertions(+), 31 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-aat1290.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-bcm6328.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-bcm6358.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-ktd2692.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-tlc591xx.txt + create mode 100644 drivers/leds/leds-aat1290.c + create mode 100644 drivers/leds/leds-bcm6328.c + create mode 100644 drivers/leds/leds-bcm6358.c + create mode 100644 drivers/leds/leds-ktd2692.c + create mode 100644 drivers/leds/leds-max77693.c + create mode 100644 drivers/leds/leds-tlc591xx.c +Merging ipmi/for-next (10120805c041 ipmi: Convert the IPMI SI ACPI handling to a platform device) +$ git merge ipmi/for-next +Auto-merging drivers/char/ipmi/ipmi_powernv.c +Merge made by the 'recursive' strategy. + drivers/acpi/acpi_pnp.c | 2 - + drivers/char/ipmi/ipmi_msghandler.c | 4 + + drivers/char/ipmi/ipmi_powernv.c | 1 - + drivers/char/ipmi/ipmi_si_intf.c | 328 ++++++++++++++++++------------------ + drivers/char/ipmi/ipmi_ssif.c | 4 +- + 5 files changed, 167 insertions(+), 172 deletions(-) +Merging driver-core/driver-core-next (0e6c861f73ec Revert "base/platform: Only insert MEM and IO resources") +$ git merge driver-core/driver-core-next +Auto-merging kernel/params.c +Auto-merging kernel/module.c +Auto-merging include/linux/moduleparam.h +Auto-merging include/linux/module.h +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 2 +- + Documentation/kernel-parameters.txt | 3 + + MAINTAINERS | 7 +- + arch/powerpc/mm/hugetlbpage.c | 4 +- + drivers/base/base.h | 1 + + drivers/base/bus.c | 31 +++- + drivers/base/cacheinfo.c | 4 +- + drivers/base/cpu.c | 29 ++++ + drivers/base/dd.c | 163 ++++++++++++++++++--- + drivers/base/firmware_class.c | 63 ++++++-- + drivers/base/platform.c | 13 ++ + drivers/edac/amd64_edac.c | 1 + + fs/kernfs/file.c | 1 - + fs/sysfs/file.c | 2 +- + fs/sysfs/group.c | 6 +- + include/linux/cacheinfo.h | 2 +- + include/linux/device.h | 31 ++++ + include/linux/module.h | 13 ++ + include/linux/moduleparam.h | 12 +- + init/main.c | 25 ++-- + kernel/module.c | 18 ++- + kernel/params.c | 11 +- + lib/dynamic_debug.c | 4 +- + 23 files changed, 367 insertions(+), 79 deletions(-) +Merging tty/tty-next (00fda1682efd Merge 4.1-rc7 into tty-next) +$ git merge tty/tty-next +Resolved 'drivers/tty/serial/8250/Kconfig' using previous resolution. +Resolved 'drivers/tty/serial/8250/Makefile' using previous resolution. +Auto-merging include/uapi/linux/gsmmux.h +Auto-merging include/uapi/linux/Kbuild +Auto-merging drivers/tty/serial/sh-sci.c +Removing drivers/tty/serial/msm_smd_tty.c +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/serial/8250/Makefile +CONFLICT (content): Merge conflict in drivers/tty/serial/8250/Makefile +Auto-merging drivers/tty/serial/8250/Kconfig +CONFLICT (content): Merge conflict in drivers/tty/serial/8250/Kconfig +Removing drivers/tty/hvc/hvc_beat.c +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/serial/renesas,sci-serial.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0e0a80156e1c] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/serial/arm_sbsa_uart.txt | 10 + + .../devicetree/bindings/serial/mtk-uart.txt | 12 +- + .../bindings/serial/nxp,lpc1850-uart.txt | 28 + + .../devicetree/bindings/serial/nxp,sc16is7xx.txt | 37 ++ + .../bindings/serial/renesas,sci-serial.txt | 7 + + .../devicetree/bindings/serial/sirf-uart.txt | 15 +- + Documentation/kernel-parameters.txt | 9 +- + arch/alpha/include/asm/serial.h | 2 +- + arch/arm/common/edma.c | 3 + + arch/blackfin/include/asm/bfin_serial.h | 8 +- + arch/m68k/include/asm/serial.h | 2 +- + arch/mn10300/include/asm/serial.h | 4 +- + arch/x86/include/asm/serial.h | 2 +- + drivers/dma/edma.c | 7 +- + drivers/input/serio/serport.c | 5 +- + drivers/tty/amiserial.c | 11 +- + drivers/tty/cyclades.c | 8 +- + drivers/tty/hvc/Kconfig | 7 - + drivers/tty/hvc/Makefile | 1 - + drivers/tty/hvc/hvc_beat.c | 134 ----- + drivers/tty/hvc/hvc_console.c | 3 +- + drivers/tty/hvc/hvcs.c | 4 +- + drivers/tty/n_gsm.c | 5 +- + drivers/tty/n_tty.c | 7 +- + drivers/tty/nozomi.c | 8 +- + drivers/tty/rocket.h | 2 +- + drivers/tty/serial/68328serial.c | 3 +- + drivers/tty/serial/8250/8250_core.c | 27 +- + drivers/tty/serial/8250/8250_dw.c | 19 +- + drivers/tty/serial/8250/8250_early.c | 2 +- + drivers/tty/serial/8250/8250_lpc18xx.c | 230 ++++++++ + drivers/tty/serial/8250/8250_mtk.c | 119 ++-- + drivers/tty/serial/8250/8250_omap.c | 65 +- + drivers/tty/serial/8250/8250_uniphier.c | 257 ++++++++ + drivers/tty/serial/8250/Kconfig | 15 + + drivers/tty/serial/8250/Makefile | 2 + + drivers/tty/serial/Kconfig | 55 +- + drivers/tty/serial/Makefile | 3 +- + drivers/tty/serial/altera_jtaguart.c | 2 +- + drivers/tty/serial/altera_uart.c | 2 +- + drivers/tty/serial/amba-pl011.c | 651 +++++++++++++-------- + drivers/tty/serial/atmel_serial.c | 22 +- + drivers/tty/serial/bfin_uart.c | 24 +- + drivers/tty/serial/crisv10.c | 106 +--- + drivers/tty/serial/earlycon.c | 9 +- + drivers/tty/serial/icom.c | 11 +- + drivers/tty/serial/ifx6x60.c | 19 +- + drivers/tty/serial/imx.c | 18 +- + drivers/tty/serial/ioc3_serial.c | 3 +- + drivers/tty/serial/ioc4_serial.c | 9 +- + drivers/tty/serial/kgdb_nmi.c | 6 +- + drivers/tty/serial/mcf.c | 2 +- + drivers/tty/serial/meson_uart.c | 2 +- + drivers/tty/serial/mpc52xx_uart.c | 2 +- + drivers/tty/serial/mpsc.c | 25 +- + drivers/tty/serial/msm_smd_tty.c | 232 -------- + drivers/tty/serial/mxs-auart.c | 2 +- + drivers/tty/serial/of_serial.c | 8 +- + drivers/tty/serial/samsung.c | 4 +- + drivers/tty/serial/sc16is7xx.c | 328 ++++++++--- + drivers/tty/serial/serial-tegra.c | 158 +++-- + drivers/tty/serial/serial_core.c | 11 +- + drivers/tty/serial/serial_mctrl_gpio.c | 5 +- + drivers/tty/serial/sh-sci.c | 96 +-- + drivers/tty/serial/sh-sci.h | 140 ++++- + drivers/tty/serial/sirfsoc_uart.c | 616 +++++++++---------- + drivers/tty/serial/sirfsoc_uart.h | 120 ++-- + drivers/tty/serial/xilinx_uartps.c | 3 +- + drivers/tty/synclink.c | 15 +- + drivers/tty/synclink_gt.c | 15 +- + drivers/tty/synclinkmp.c | 12 +- + drivers/tty/tty_buffer.c | 3 +- + drivers/tty/tty_io.c | 34 +- + drivers/tty/tty_ioctl.c | 4 +- + drivers/tty/tty_ldisc.c | 8 +- + drivers/tty/tty_ldsem.c | 3 +- + drivers/tty/vt/consolemap.c | 60 +- + drivers/tty/vt/vt.c | 92 ++- + drivers/video/console/fbcon.c | 5 +- + drivers/video/console/fbcon.h | 1 + + include/linux/console_struct.h | 1 + + include/linux/serial_8250.h | 3 + + include/linux/serial_core.h | 2 +- + include/linux/serial_sci.h | 86 +-- + include/linux/tty.h | 2 +- + include/uapi/linux/Kbuild | 1 + + include/{ => uapi}/linux/gsmmux.h | 3 + + include/uapi/linux/tty_flags.h | 2 +- + 88 files changed, 2384 insertions(+), 1742 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/arm_sbsa_uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/nxp,lpc1850-uart.txt + delete mode 100644 drivers/tty/hvc/hvc_beat.c + create mode 100644 drivers/tty/serial/8250/8250_lpc18xx.c + create mode 100644 drivers/tty/serial/8250/8250_uniphier.c + delete mode 100644 drivers/tty/serial/msm_smd_tty.c + rename include/{ => uapi}/linux/gsmmux.h (94%) +Merging usb/usb-next (b0a252ed983b USB: ssb: use devm_kzalloc) +$ git merge usb/usb-next +Resolved 'drivers/phy/Makefile' using previous resolution. +Removing include/linux/platform_data/usb-rcar-gen2-phy.h +Removing drivers/usb/phy/phy-rcar-gen2-usb.c +Auto-merging drivers/usb/host/Kconfig +Auto-merging drivers/phy/Makefile +CONFLICT (content): Merge conflict in drivers/phy/Makefile +Auto-merging drivers/phy/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b8754f730334] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-platform-twl4030-usb | 8 + + .../bindings/phy/brcm,brcmstb-sata-phy.txt | 40 ++ + .../devicetree/bindings/phy/rcar-gen2-phy.txt | 1 + + .../devicetree/bindings/power/twl-charger.txt | 10 + + Documentation/devicetree/bindings/usb/dwc3-st.txt | 7 +- + Documentation/devicetree/bindings/usb/dwc3.txt | 2 + + .../devicetree/bindings/usb/msm-hsusb.txt | 11 + + .../devicetree/bindings/usb/renesas_usbhs.txt | 1 + + .../devicetree/bindings/usb/twlxxxx-usb.txt | 3 + + Documentation/devicetree/bindings/usb/usb-ehci.txt | 2 + + Documentation/phy.txt | 7 +- + Documentation/usb/gadget-testing.txt | 4 +- + MAINTAINERS | 7 + + drivers/phy/Kconfig | 16 + + drivers/phy/Makefile | 2 + + drivers/phy/phy-brcmstb-sata.c | 216 ++++++ + drivers/phy/phy-core.c | 67 +- + drivers/phy/phy-miphy28lp.c | 9 +- + drivers/phy/phy-miphy365x.c | 9 +- + drivers/phy/phy-rcar-gen2.c | 6 +- + drivers/phy/phy-sun4i-usb.c | 9 + + drivers/phy/phy-tusb1210.c | 153 ++++ + drivers/phy/phy-twl4030-usb.c | 34 +- + drivers/phy/ulpi_phy.h | 31 + + drivers/power/twl4030_charger.c | 21 +- + drivers/usb/atm/speedtch.c | 18 +- + drivers/usb/atm/usbatm.c | 6 +- + drivers/usb/atm/xusbatm.c | 6 +- + drivers/usb/class/cdc-acm.c | 57 +- + drivers/usb/class/cdc-acm.h | 3 +- + drivers/usb/class/usblp.c | 15 +- + drivers/usb/class/usbtmc.c | 1 + + drivers/usb/common/Makefile | 1 + + drivers/usb/common/ulpi.c | 255 +++++++ + drivers/usb/core/Kconfig | 20 + + drivers/usb/core/buffer.c | 3 +- + drivers/usb/core/devio.c | 2 +- + drivers/usb/core/hcd.c | 3 +- + drivers/usb/core/hub.c | 122 ++-- + drivers/usb/dwc2/Kconfig | 8 - + drivers/usb/dwc2/Makefile | 9 +- + drivers/usb/dwc2/core.c | 439 +++++++++++- + drivers/usb/dwc2/core.h | 120 +++- + drivers/usb/dwc2/core_intr.c | 45 +- + drivers/usb/dwc2/debug.h | 27 + + drivers/usb/dwc2/debugfs.c | 771 +++++++++++++++++++++ + drivers/usb/dwc2/gadget.c | 459 ++---------- + drivers/usb/dwc2/hcd.c | 100 +-- + drivers/usb/dwc2/hcd.h | 7 +- + drivers/usb/dwc2/hcd_intr.c | 66 +- + drivers/usb/dwc2/hcd_queue.c | 18 +- + drivers/usb/dwc2/platform.c | 25 +- + drivers/usb/dwc3/Kconfig | 7 + + drivers/usb/dwc3/Makefile | 4 + + drivers/usb/dwc3/core.c | 108 ++- + drivers/usb/dwc3/core.h | 26 + + drivers/usb/dwc3/dwc3-pci.c | 36 + + drivers/usb/dwc3/gadget.c | 10 +- + drivers/usb/dwc3/platform_data.h | 2 + + drivers/usb/dwc3/ulpi.c | 91 +++ + drivers/usb/gadget/epautoconf.c | 24 +- + drivers/usb/gadget/function/f_fs.c | 10 +- + drivers/usb/gadget/function/f_rndis.c | 60 +- + drivers/usb/gadget/function/rndis.c | 352 +++++----- + drivers/usb/gadget/function/rndis.h | 33 +- + drivers/usb/gadget/function/u_rndis.h | 2 - + drivers/usb/gadget/function/uvc.h | 1 - + drivers/usb/gadget/legacy/inode.c | 9 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 6 +- + drivers/usb/gadget/udc/net2280.c | 140 +++- + drivers/usb/gadget/udc/s3c2410_udc.c | 28 +- + drivers/usb/host/Kconfig | 2 +- + drivers/usb/host/Makefile | 5 +- + drivers/usb/host/ehci-dbg.c | 3 +- + drivers/usb/host/ehci-fsl.c | 168 ++--- + drivers/usb/host/ehci-hcd.c | 8 +- + drivers/usb/host/ehci-hub.c | 3 +- + drivers/usb/host/ehci-platform.c | 73 +- + drivers/usb/host/ehci-tegra.c | 12 +- + drivers/usb/host/ehci.h | 3 + + drivers/usb/host/fsl-mph-dr-of.c | 8 + + drivers/usb/host/fusbh200-hcd.c | 3 +- + drivers/usb/host/isp116x-hcd.c | 3 +- + drivers/usb/host/ohci-dbg.c | 6 +- + drivers/usb/host/ohci-hcd.c | 3 +- + drivers/usb/host/ohci-platform.c | 69 +- + drivers/usb/host/ohci-q.c | 3 +- + drivers/usb/host/ssb-hcd.c | 15 +- + drivers/usb/host/xhci-hub.c | 65 +- + drivers/usb/host/xhci-pci.c | 17 +- + drivers/usb/host/xhci-plat.c | 43 +- + drivers/usb/host/xhci-ring.c | 7 +- + drivers/usb/host/xhci.c | 44 +- + drivers/usb/host/xhci.h | 19 +- + drivers/usb/isp1760/isp1760-udc.c | 2 + + drivers/usb/misc/sisusbvga/sisusb.c | 39 +- + drivers/usb/misc/sisusbvga/sisusb_con.c | 54 +- + drivers/usb/misc/uss720.c | 6 +- + drivers/usb/mon/mon_bin.c | 7 +- + drivers/usb/mon/mon_main.c | 12 +- + drivers/usb/mon/mon_stat.c | 3 +- + drivers/usb/musb/am35x.c | 8 +- + drivers/usb/musb/blackfin.c | 5 + + drivers/usb/musb/cppi_dma.c | 9 +- + drivers/usb/musb/da8xx.c | 6 +- + drivers/usb/musb/davinci.c | 7 +- + drivers/usb/musb/jz4740.c | 6 +- + drivers/usb/musb/musb_core.c | 81 ++- + drivers/usb/musb/musb_core.h | 28 +- + drivers/usb/musb/musb_cppi41.c | 8 +- + drivers/usb/musb/musb_debugfs.c | 100 ++- + drivers/usb/musb/musb_dma.h | 67 +- + drivers/usb/musb/musb_dsps.c | 6 +- + drivers/usb/musb/musb_gadget.c | 24 +- + drivers/usb/musb/musb_host.c | 536 ++++++++------ + drivers/usb/musb/musb_io.h | 2 + + drivers/usb/musb/musb_regs.h | 80 ++- + drivers/usb/musb/musb_virthub.c | 2 + + drivers/usb/musb/musbhsdma.c | 9 +- + drivers/usb/musb/omap2430.c | 5 + + drivers/usb/musb/tusb6010.c | 8 +- + drivers/usb/musb/tusb6010.h | 6 - + drivers/usb/musb/tusb6010_omap.c | 9 +- + drivers/usb/musb/ux500.c | 8 +- + drivers/usb/musb/ux500_dma.c | 8 +- + drivers/usb/phy/Kconfig | 16 +- + drivers/usb/phy/Makefile | 1 - + drivers/usb/phy/phy-ab8500-usb.c | 2 +- + drivers/usb/phy/phy-msm-usb.c | 110 +++ + drivers/usb/phy/phy-rcar-gen2-usb.c | 246 ------- + drivers/usb/phy/phy.c | 97 ++- + drivers/usb/renesas_usbhs/common.c | 19 +- + drivers/usb/renesas_usbhs/fifo.h | 9 +- + drivers/usb/renesas_usbhs/mod.c | 63 +- + drivers/usb/serial/mos7840.c | 11 +- + drivers/usb/storage/alauda.c | 12 +- + drivers/usb/storage/cypress_atacb.c | 10 +- + drivers/usb/storage/datafab.c | 12 +- + drivers/usb/storage/ene_ub6250.c | 11 +- + drivers/usb/storage/freecom.c | 12 +- + drivers/usb/storage/isd200.c | 11 +- + drivers/usb/storage/jumpshot.c | 11 +- + drivers/usb/storage/karma.c | 12 +- + drivers/usb/storage/onetouch.c | 12 +- + drivers/usb/storage/realtek_cr.c | 12 +- + drivers/usb/storage/scsiglue.c | 30 +- + drivers/usb/storage/scsiglue.h | 3 +- + drivers/usb/storage/sddr09.c | 12 +- + drivers/usb/storage/sddr55.c | 11 +- + drivers/usb/storage/shuttle_usbat.c | 12 +- + drivers/usb/storage/usb.c | 16 +- + drivers/usb/storage/usb.h | 16 +- + include/linux/fsl_devices.h | 1 + + include/linux/mod_devicetable.h | 6 + + include/linux/phy/phy-sun4i-usb.h | 26 + + include/linux/phy/phy.h | 9 + + include/linux/platform_data/usb-rcar-gen2-phy.h | 22 - + include/linux/ulpi/driver.h | 60 ++ + include/linux/ulpi/interface.h | 23 + + include/linux/ulpi/regs.h | 130 ++++ + include/linux/usb/hcd.h | 2 - + include/linux/usb/msm_hsusb.h | 22 + + include/linux/usb/msm_hsusb_hw.h | 9 + + include/linux/usb/net2280.h | 3 + + include/linux/usb/phy.h | 8 + + include/linux/usb/renesas_usbhs.h | 3 +- + include/linux/usb/ulpi.h | 134 +--- + include/linux/usb/usb338x.h | 4 + + scripts/mod/devicetable-offsets.c | 4 + + scripts/mod/file2alias.c | 13 + + 170 files changed, 4976 insertions(+), 2256 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-twl4030-usb + create mode 100644 Documentation/devicetree/bindings/phy/brcm,brcmstb-sata-phy.txt + create mode 100644 drivers/phy/phy-brcmstb-sata.c + create mode 100644 drivers/phy/phy-tusb1210.c + create mode 100644 drivers/phy/ulpi_phy.h + create mode 100644 drivers/usb/common/ulpi.c + create mode 100644 drivers/usb/dwc2/debug.h + create mode 100644 drivers/usb/dwc2/debugfs.c + create mode 100644 drivers/usb/dwc3/ulpi.c + delete mode 100644 drivers/usb/phy/phy-rcar-gen2-usb.c + create mode 100644 include/linux/phy/phy-sun4i-usb.h + delete mode 100644 include/linux/platform_data/usb-rcar-gen2-phy.h + create mode 100644 include/linux/ulpi/driver.h + create mode 100644 include/linux/ulpi/interface.h + create mode 100644 include/linux/ulpi/regs.h +Merging usb-gadget/next (e18b7975c885 usb: dwc3: gadget: don't clear EP_BUSY too early) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (f05b7cb6f2be USB: serial: mos7840: Use setup_timer) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging staging/staging-next (6394d6d01bf0 Merge 4.1-rc7 into staging-testing) +$ git merge staging/staging-next +Auto-merging tools/Makefile +CONFLICT (content): Merge conflict in tools/Makefile +Removing drivers/staging/vt6655/mib.h +Removing drivers/staging/vt6655/mib.c +Auto-merging drivers/staging/vt6655/device_main.c +Removing drivers/staging/unisys/visorutil/visorkmodutils.c +Removing drivers/staging/unisys/visorutil/memregion_direct.c +Removing drivers/staging/unisys/visorutil/memregion.h +Removing drivers/staging/unisys/visorutil/charqueue.h +Removing drivers/staging/unisys/visorutil/charqueue.c +Removing drivers/staging/unisys/visorutil/Makefile +Removing drivers/staging/unisys/visorutil/Kconfig +Removing drivers/staging/unisys/visorchipset/visorchipset_umode.h +Removing drivers/staging/unisys/visorchipset/visorchipset.h +Removing drivers/staging/unisys/visorchipset/parser.h +Removing drivers/staging/unisys/visorchipset/parser.c +Removing drivers/staging/unisys/visorchipset/globals.h +Removing drivers/staging/unisys/visorchipset/file.h +Removing drivers/staging/unisys/visorchipset/file.c +Removing drivers/staging/unisys/visorchipset/Makefile +Removing drivers/staging/unisys/visorchipset/Kconfig +Removing drivers/staging/unisys/visorchannel/visorchannel.h +Auto-merging drivers/staging/unisys/visorbus/vmcallinterface.h +Auto-merging drivers/staging/unisys/visorbus/visorchipset.c +Auto-merging drivers/staging/unisys/visorbus/visorchannel.c +Auto-merging drivers/staging/unisys/visorbus/vbuschannel.h +Auto-merging drivers/staging/unisys/visorbus/periodic_work.c +Auto-merging drivers/staging/unisys/visorbus/controlvmchannel.h +Removing drivers/staging/unisys/virtpci/virtpci.h +Removing drivers/staging/unisys/virtpci/virtpci.c +Removing drivers/staging/unisys/virtpci/Makefile +Removing drivers/staging/unisys/virtpci/Kconfig +Removing drivers/staging/unisys/virthba/virthba.h +Removing drivers/staging/unisys/virthba/virthba.c +Removing drivers/staging/unisys/virthba/Makefile +Removing drivers/staging/unisys/virthba/Kconfig +Removing drivers/staging/unisys/uislib/uisutils.c +Removing drivers/staging/unisys/uislib/uisthread.c +Removing drivers/staging/unisys/uislib/uisqueue.c +Removing drivers/staging/unisys/uislib/uislib.c +Removing drivers/staging/unisys/uislib/Makefile +Removing drivers/staging/unisys/uislib/Kconfig +Removing drivers/staging/unisys/include/uisutils.h +Removing drivers/staging/unisys/include/uisthread.h +Removing drivers/staging/unisys/include/uisqueue.h +Removing drivers/staging/unisys/include/timskmod.h +Removing drivers/staging/unisys/include/sparstop.h +Removing drivers/staging/unisys/include/procobjecttree.h +Auto-merging drivers/staging/unisys/include/iochannel.h +Auto-merging drivers/staging/unisys/include/channel.h +Removing drivers/staging/unisys/common-spar/include/diagnostics/appos_subsystems.h +Removing drivers/staging/unisys/common-spar/include/channels/controlframework.h +Removing drivers/staging/rtl8192e/rtllib_crypt.h +Removing drivers/staging/rtl8192e/rtllib_crypt.c +Removing drivers/staging/rtl8192e/rtl8192e/rtl_crypto.h +Removing drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h +CONFLICT (modify/delete): drivers/staging/media/dt3155v4l/dt3155v4l.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/dt3155v4l/dt3155v4l.c left in tree. +Auto-merging drivers/staging/media/bcm2048/radio-bcm2048.c +Auto-merging drivers/staging/lustre/lustre/ptlrpc/service.c +Removing drivers/staging/lustre/lustre/obdecho/lproc_echo.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h +Removing drivers/staging/lustre/lustre/include/lustre_quota.h +Removing drivers/staging/i2o/pci.c +Removing drivers/staging/i2o/memory.c +Removing drivers/staging/i2o/iop.c +Removing drivers/staging/i2o/i2o_scsi.c +Removing drivers/staging/i2o/i2o_proc.c +Removing drivers/staging/i2o/i2o_config.c +Removing drivers/staging/i2o/i2o_block.h +Removing drivers/staging/i2o/i2o_block.c +Removing drivers/staging/i2o/i2o.h +Removing drivers/staging/i2o/exec-osm.c +Removing drivers/staging/i2o/driver.c +Removing drivers/staging/i2o/device.c +Removing drivers/staging/i2o/debug.c +Removing drivers/staging/i2o/core.h +Removing drivers/staging/i2o/configResolved 'tools/Makefile' using previous resolution. +-osm.c +Removing drivers/staging/i2o/bus-osm.c +Removing drivers/staging/i2o/README.ioctl +Removing drivers/staging/i2o/README +Removing drivers/staging/i2o/Makefile +Removing drivers/staging/i2o/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/media/dt3155v4l/dt3155v4l.c +drivers/staging/media/dt3155v4l/dt3155v4l.c: needs merge +rm 'drivers/staging/media/dt3155v4l/dt3155v4l.c' +$ git commit -v -a +[master 1da3ffa8cf37] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 99 + + .../devicetree/bindings/iio/adc/berlin2_adc.txt | 19 + + .../devicetree/bindings/iio/adc/ti-adc128s052.txt | 4 +- + .../devicetree/bindings/iio/imu/inv_mpu6050.txt | 17 + + .../bindings/iio/magnetometer/bmc150_magn.txt | 22 + + .../devicetree/bindings/iio/st-sensors.txt | 1 + + .../bindings/iio/temperature/mlx90614.txt | 24 + + .../bindings/input/touchscreen/ti-tsc-adc.txt | 24 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 9 + + drivers/Makefile | 1 - + drivers/iio/accel/Kconfig | 21 + + drivers/iio/accel/Makefile | 3 + + drivers/iio/accel/bmc150-accel.c | 55 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 15 +- + drivers/iio/accel/kxcjk-1013.c | 42 +- + drivers/iio/accel/mma8452.c | 62 +- + drivers/iio/accel/mma9551_core.c | 8 +- + drivers/iio/accel/mma9551_core.h | 2 +- + drivers/iio/accel/mma9553.c | 148 +- + drivers/iio/accel/stk8312.c | 390 + + drivers/iio/accel/stk8ba50.c | 302 + + drivers/iio/adc/Kconfig | 11 +- + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/axp288_adc.c | 2 +- + drivers/iio/adc/berlin2-adc.c | 378 + + drivers/iio/adc/ti-adc128s052.c | 30 +- + drivers/iio/adc/ti_am335x_adc.c | 83 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 23 +- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 4 +- + drivers/iio/dac/Kconfig | 10 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/m62332.c | 269 + + drivers/iio/gyro/bmg160.c | 67 +- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 15 +- + drivers/iio/humidity/Kconfig | 2 +- + drivers/iio/industrialio-buffer.c | 328 +- + drivers/iio/industrialio-core.c | 6 + + drivers/iio/industrialio-event.c | 2 + + drivers/iio/light/Kconfig | 37 +- + drivers/iio/light/Makefile | 3 + + drivers/iio/light/acpi-als.c | 231 + + drivers/iio/light/bh1750.c | 334 + + drivers/iio/light/hid-sensor-als.c | 14 +- + drivers/iio/light/hid-sensor-prox.c | 2 +- + drivers/iio/light/ltr501.c | 1284 +++- + drivers/iio/light/stk3310.c | 722 ++ + drivers/iio/light/tsl2563.c | 36 +- + drivers/iio/light/tsl4531.c | 10 +- + drivers/iio/magnetometer/Kconfig | 29 +- + drivers/iio/magnetometer/Makefile | 3 + + drivers/iio/magnetometer/bmc150_magn.c | 1109 +++ + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 2 +- + drivers/iio/magnetometer/mmc35240.c | 512 ++ + drivers/iio/magnetometer/st_magn.h | 1 + + drivers/iio/magnetometer/st_magn_core.c | 116 + + drivers/iio/magnetometer/st_magn_i2c.c | 5 + + drivers/iio/orientation/hid-sensor-incl-3d.c | 16 +- + drivers/iio/orientation/hid-sensor-rotation.c | 17 +- + drivers/iio/pressure/hid-sensor-press.c | 14 +- + drivers/iio/proximity/sx9500.c | 457 +- + drivers/iio/temperature/mlx90614.c | 353 +- + drivers/iio/temperature/tmp006.c | 6 +- + drivers/platform/goldfish/goldfish_pipe.c | 18 +- + drivers/staging/Kconfig | 4 +- + drivers/staging/Makefile | 4 +- + drivers/staging/android/Kconfig | 11 +- + drivers/staging/android/ion/ion.c | 1 + + drivers/staging/android/ion/ion_chunk_heap.c | 2 +- + drivers/staging/android/ion/ion_priv.h | 6 +- + drivers/staging/android/ion/ion_test.c | 20 +- + drivers/staging/android/ion/tegra/tegra_ion.c | 1 + + drivers/staging/android/lowmemorykiller.c | 17 +- + drivers/staging/android/uapi/ion.h | 2 +- + drivers/staging/comedi/Kconfig | 18 +- + drivers/staging/comedi/comedi.h | 2 +- + drivers/staging/comedi/comedi_fops.c | 43 +- + drivers/staging/comedi/comedi_internal.h | 1 + + drivers/staging/comedi/comedidev.h | 18 +- + drivers/staging/comedi/drivers.c | 2 +- + drivers/staging/comedi/drivers/8255.c | 232 +- + drivers/staging/comedi/drivers/8255.h | 19 +- + drivers/staging/comedi/drivers/Makefile | 3 +- + drivers/staging/comedi/drivers/addi_watchdog.h | 2 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 37 +- + drivers/staging/comedi/drivers/amplc_dio200.h | 44 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 61 +- + drivers/staging/comedi/drivers/amplc_dio200_pci.c | 35 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 154 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 6 +- + drivers/staging/comedi/drivers/comedi_8254.h | 6 + + drivers/staging/comedi/drivers/comedi_8255.c | 285 + + drivers/staging/comedi/drivers/comedi_bond.c | 3 +- + drivers/staging/comedi/drivers/comedi_isadma.h | 4 + + drivers/staging/comedi/drivers/daqboard2000.c | 196 +- + drivers/staging/comedi/drivers/das16m1.c | 4 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 191 +- + drivers/staging/comedi/drivers/me_daq.c | 3 +- + drivers/staging/comedi/drivers/mite.c | 110 +- + drivers/staging/comedi/drivers/mite.h | 88 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 2408 +++--- + drivers/staging/comedi/drivers/ni_pcimio.c | 17 +- + drivers/staging/comedi/drivers/ni_stc.h | 2237 +++--- + drivers/staging/comedi/drivers/pcl812.c | 10 +- + drivers/staging/comedi/drivers/pcl816.c | 2 +- + drivers/staging/comedi/drivers/serial2002.c | 2 +- + drivers/staging/dgap/dgap.c | 133 +- + drivers/staging/dgap/dgap.h | 2 +- + drivers/staging/dgnc/TODO | 6 +- + drivers/staging/dgnc/dgnc_cls.c | 4 +- + drivers/staging/dgnc/dgnc_driver.c | 9 - + drivers/staging/dgnc/dgnc_driver.h | 3 - + drivers/staging/dgnc/dgnc_neo.c | 4 +- + drivers/staging/dgnc/dgnc_sysfs.c | 110 +- + drivers/staging/dgnc/dgnc_tty.c | 106 +- + drivers/staging/dgnc/digi.h | 14 +- + drivers/staging/emxx_udc/emxx_udc.c | 39 +- + drivers/staging/fbtft/Kconfig | 8 +- + drivers/staging/fbtft/Makefile | 1 + + drivers/staging/fbtft/fb_hx8357d.c | 222 + + drivers/staging/fbtft/fb_hx8357d.h | 102 + + drivers/staging/fbtft/fb_st7735r.c | 8 +- + drivers/staging/fbtft/fb_tls8204.c | 1 + + drivers/staging/fbtft/fbtft-bus.c | 8 +- + drivers/staging/fbtft/fbtft-core.c | 7 +- + drivers/staging/fbtft/internal.h | 2 +- + drivers/staging/fsl-mc/bus/mc-bus.c | 1 - + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 3 +- + drivers/staging/fwserial/dma_fifo.c | 2 +- + drivers/staging/fwserial/fwserial.c | 5 +- + drivers/staging/fwserial/fwserial.h | 2 +- + drivers/staging/gdm724x/gdm_endian.c | 46 +- + drivers/staging/gdm724x/gdm_endian.h | 11 - + drivers/staging/gdm72xx/gdm_wimax.c | 2 +- + drivers/staging/gdm72xx/netlink_k.c | 2 +- + drivers/staging/goldfish/goldfish_audio.c | 2 +- + drivers/staging/goldfish/goldfish_nand.c | 2 +- + drivers/staging/i2o/Kconfig | 120 - + drivers/staging/i2o/Makefile | 16 - + drivers/staging/i2o/README | 98 - + drivers/staging/i2o/README.ioctl | 394 - + drivers/staging/i2o/bus-osm.c | 177 - + drivers/staging/i2o/config-osm.c | 90 - + drivers/staging/i2o/core.h | 69 - + drivers/staging/i2o/debug.c | 473 -- + drivers/staging/i2o/device.c | 592 -- + drivers/staging/i2o/driver.c | 381 - + drivers/staging/i2o/exec-osm.c | 612 -- + drivers/staging/i2o/i2o.h | 988 --- + drivers/staging/i2o/i2o_block.c | 1228 --- + drivers/staging/i2o/i2o_block.h | 103 - + drivers/staging/i2o/i2o_config.c | 1162 --- + drivers/staging/i2o/i2o_proc.c | 2049 ----- + drivers/staging/i2o/i2o_scsi.c | 814 -- + drivers/staging/i2o/iop.c | 1255 --- + drivers/staging/i2o/memory.c | 312 - + drivers/staging/i2o/pci.c | 500 -- + drivers/staging/iio/Documentation/device.txt | 2 +- + drivers/staging/iio/accel/Kconfig | 2 +- + drivers/staging/iio/adc/Kconfig | 6 +- + drivers/staging/iio/adc/ad7606_par.c | 2 +- + drivers/staging/iio/addac/Kconfig | 2 +- + drivers/staging/iio/iio_simple_dummy.h | 2 +- + drivers/staging/iio/iio_simple_dummy_events.c | 2 + + drivers/staging/iio/light/isl29018.c | 297 +- + drivers/staging/iio/resolver/Kconfig | 4 +- + drivers/staging/lustre/TODO | 2 +- + .../staging/lustre/include/linux/libcfs/libcfs.h | 27 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 13 - + .../lustre/include/linux/libcfs/linux/libcfs.h | 1 - + drivers/staging/lustre/include/linux/lnet/api.h | 1 - + .../staging/lustre/include/linux/lnet/lib-lnet.h | 2 - + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 458 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 680 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 484 +- + .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 48 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 468 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 560 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 396 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 150 +- + .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 33 +- + .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 128 +- + drivers/staging/lustre/lnet/lnet/acceptor.c | 32 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 232 +- + drivers/staging/lustre/lnet/lnet/config.c | 238 +- + drivers/staging/lustre/lnet/lnet/lib-eq.c | 44 +- + drivers/staging/lustre/lnet/lnet/lib-md.c | 26 +- + drivers/staging/lustre/lnet/lnet/lib-me.c | 20 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 264 +- + drivers/staging/lustre/lnet/lnet/lib-msg.c | 50 +- + drivers/staging/lustre/lnet/lnet/lib-ptl.c | 116 +- + drivers/staging/lustre/lnet/lnet/lo.c | 2 +- + drivers/staging/lustre/lnet/lnet/module.c | 22 +- + drivers/staging/lustre/lnet/lnet/peer.c | 50 +- + drivers/staging/lustre/lnet/lnet/router.c | 224 +- + drivers/staging/lustre/lnet/lnet/router_proc.c | 210 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 60 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 54 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 124 +- + drivers/staging/lustre/lnet/selftest/conrpc.h | 34 +- + drivers/staging/lustre/lnet/selftest/console.c | 246 +- + drivers/staging/lustre/lnet/selftest/console.h | 186 +- + drivers/staging/lustre/lnet/selftest/framework.c | 160 +- + drivers/staging/lustre/lnet/selftest/module.c | 10 +- + drivers/staging/lustre/lnet/selftest/ping_test.c | 24 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 150 +- + drivers/staging/lustre/lnet/selftest/rpc.h | 141 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 311 +- + drivers/staging/lustre/lnet/selftest/timer.c | 20 +- + drivers/staging/lustre/lnet/selftest/timer.h | 16 +- + drivers/staging/lustre/lustre/fid/Makefile | 3 +- + drivers/staging/lustre/lustre/fid/fid_internal.h | 6 +- + drivers/staging/lustre/lustre/fid/fid_request.c | 73 +- + drivers/staging/lustre/lustre/fid/lproc_fid.c | 49 +- + drivers/staging/lustre/lustre/fld/Makefile | 3 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 16 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 5 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 74 +- + drivers/staging/lustre/lustre/fld/lproc_fld.c | 42 +- + drivers/staging/lustre/lustre/include/dt_object.h | 3 - + .../lustre/lustre/include/linux/lustre_lite.h | 1 - + drivers/staging/lustre/lustre/include/linux/obd.h | 10 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 313 +- + drivers/staging/lustre/lustre/include/lu_object.h | 2 - + drivers/staging/lustre/lustre/include/lustre_dlm.h | 69 +- + .../lustre/lustre/include/lustre_dlm_flags.h | 17 +- + .../staging/lustre/lustre/include/lustre_export.h | 29 - + drivers/staging/lustre/lustre/include/lustre_fid.h | 5 +- + drivers/staging/lustre/lustre/include/lustre_fld.h | 16 +- + drivers/staging/lustre/lustre/include/lustre_lib.h | 15 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 17 +- + .../staging/lustre/lustre/include/lustre_quota.h | 241 - + drivers/staging/lustre/lustre/include/lustre_sec.h | 8 - + drivers/staging/lustre/lustre/include/obd.h | 22 +- + drivers/staging/lustre/lustre/include/obd_class.h | 36 +- + .../staging/lustre/lustre/include/obd_support.h | 66 +- + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 45 +- + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 76 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 7 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 11 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 90 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 175 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 358 +- + drivers/staging/lustre/lustre/libcfs/Makefile | 1 + + .../staging/lustre/lustre/libcfs/linux/linux-mem.c | 59 + + .../lustre/lustre/libcfs/linux/linux-tracefile.c | 9 +- + drivers/staging/lustre/lustre/libcfs/module.c | 1 - + drivers/staging/lustre/lustre/llite/Makefile | 3 +- + drivers/staging/lustre/lustre/llite/dcache.c | 6 +- + drivers/staging/lustre/lustre/llite/dir.c | 42 +- + drivers/staging/lustre/lustre/llite/file.c | 55 +- + drivers/staging/lustre/lustre/llite/llite_close.c | 6 +- + .../staging/lustre/lustre/llite/llite_internal.h | 39 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 74 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 2 +- + drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 4 +- + drivers/staging/lustre/lustre/llite/lloop.c | 8 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 713 +- + drivers/staging/lustre/lustre/llite/namei.c | 2 +- + drivers/staging/lustre/lustre/llite/rw26.c | 20 - + drivers/staging/lustre/lustre/llite/statahead.c | 21 +- + drivers/staging/lustre/lustre/llite/super25.c | 27 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 21 +- + drivers/staging/lustre/lustre/llite/xattr.c | 10 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 6 +- + drivers/staging/lustre/lustre/lmv/Makefile | 3 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 4 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 8 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 112 +- + drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 105 +- + drivers/staging/lustre/lustre/lov/Makefile | 3 +- + drivers/staging/lustre/lustre/lov/lov_dev.c | 19 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 7 - + drivers/staging/lustre/lustre/lov/lov_io.c | 5 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 89 +- + drivers/staging/lustre/lustre/lov/lov_pack.c | 3 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 51 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 35 +- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 4 +- + drivers/staging/lustre/lustre/lov/lproc_lov.c | 58 +- + drivers/staging/lustre/lustre/mdc/Makefile | 3 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 92 +- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 7 - + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 2 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 38 +- + drivers/staging/lustre/lustre/mgc/Makefile | 3 +- + drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 9 - + drivers/staging/lustre/lustre/mgc/mgc_internal.h | 11 - + drivers/staging/lustre/lustre/mgc/mgc_request.c | 28 +- + drivers/staging/lustre/lustre/obdclass/Makefile | 4 +- + drivers/staging/lustre/lustre/obdclass/acl.c | 30 +- + drivers/staging/lustre/lustre/obdclass/capa.c | 4 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 13 +- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 20 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 41 +- + drivers/staging/lustre/lustre/obdclass/dt_object.c | 6 - + drivers/staging/lustre/lustre/obdclass/genops.c | 75 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 153 +- + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 25 - + drivers/staging/lustre/lustre/obdclass/llog.c | 25 +- + drivers/staging/lustre/lustre/obdclass/llog_obd.c | 4 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 625 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 10 +- + .../lustre/lustre/obdclass/lustre_handles.c | 2 +- + .../staging/lustre/lustre/obdclass/lustre_peer.c | 6 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 147 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 107 +- + drivers/staging/lustre/lustre/obdecho/Makefile | 2 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 53 +- + drivers/staging/lustre/lustre/obdecho/lproc_echo.c | 57 - + drivers/staging/lustre/lustre/osc/Makefile | 3 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 400 +- + drivers/staging/lustre/lustre/osc/osc_dev.c | 4 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 8 - + drivers/staging/lustre/lustre/osc/osc_request.c | 38 +- + drivers/staging/lustre/lustre/ptlrpc/Makefile | 3 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 20 +- + drivers/staging/lustre/lustre/ptlrpc/connection.c | 6 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 267 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 32 +- + drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 18 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 21 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 17 +- + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 16 +- + drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 35 +- + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 13 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 110 +- + drivers/staging/lustre/sysfs-fs-lustre | 543 ++ + drivers/staging/media/bcm2048/radio-bcm2048.c | 4 +- + drivers/staging/nvec/nvec.c | 2 +- + drivers/staging/octeon-usb/octeon-hcd.c | 16 +- + drivers/staging/octeon-usb/octeon-hcd.h | 2 +- + drivers/staging/octeon/ethernet-defines.h | 62 +- + drivers/staging/octeon/ethernet-mdio.c | 48 +- + drivers/staging/octeon/ethernet-mdio.h | 24 +- + drivers/staging/octeon/ethernet-mem.c | 30 +- + drivers/staging/octeon/ethernet-mem.h | 23 +- + drivers/staging/octeon/ethernet-rgmii.c | 306 +- + drivers/staging/octeon/ethernet-rx.c | 38 +- + drivers/staging/octeon/ethernet-rx.h | 24 +- + drivers/staging/octeon/ethernet-sgmii.c | 112 +- + drivers/staging/octeon/ethernet-spi.c | 237 +- + drivers/staging/octeon/ethernet-tx.c | 28 +- + drivers/staging/octeon/ethernet-tx.h | 23 +- + drivers/staging/octeon/ethernet-util.h | 23 +- + drivers/staging/octeon/ethernet-xaui.c | 114 +- + drivers/staging/octeon/ethernet.c | 115 +- + drivers/staging/octeon/octeon-ethernet.h | 35 +- + drivers/staging/panel/panel.c | 60 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 54 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 24 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 2 + + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 2 - + drivers/staging/rtl8188eu/hal/hal_intf.c | 2 + + drivers/staging/rtl8188eu/include/drv_types.h | 1 - + drivers/staging/rtl8188eu/include/ieee80211.h | 29 +- + drivers/staging/rtl8188eu/include/osdep_intf.h | 2 - + drivers/staging/rtl8188eu/include/osdep_service.h | 2 - + drivers/staging/rtl8188eu/include/recv_osdep.h | 3 - + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 4 +- + drivers/staging/rtl8188eu/include/rtw_ap.h | 2 - + drivers/staging/rtl8188eu/include/rtw_ioctl.h | 2 - + drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 +- + drivers/staging/rtl8188eu/include/wifi.h | 77 - + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 8 +- + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 4 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 110 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 12 - + drivers/staging/rtl8192e/dot11d.h | 4 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 25 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 63 +- + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 43 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 118 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 1496 ++-- + drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h | 908 --- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 22 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 91 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 21 +- + drivers/staging/rtl8192e/rtl8192e/rtl_crypto.h | 382 - + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 1099 +-- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 9 + + drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 6 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 13 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 107 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 149 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 54 +- + drivers/staging/rtl8192e/rtl819x_Qos.h | 4 +- + drivers/staging/rtl8192e/rtl819x_TS.h | 2 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 75 +- + drivers/staging/rtl8192e/rtllib.h | 125 +- + drivers/staging/rtl8192e/rtllib_crypt.c | 254 - + drivers/staging/rtl8192e/rtllib_crypt.h | 34 - + drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 2 +- + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 89 +- + drivers/staging/rtl8192e/rtllib_debug.h | 11 +- + drivers/staging/rtl8192e/rtllib_module.c | 63 +- + drivers/staging/rtl8192e/rtllib_rx.c | 1018 +-- + drivers/staging/rtl8192e/rtllib_softmac.c | 170 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 18 +- + drivers/staging/rtl8192e/rtllib_tx.c | 78 +- + drivers/staging/rtl8192e/rtllib_wx.c | 51 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 188 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 10 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 26 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 9 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 76 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 32 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 14 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 48 +- + drivers/staging/rtl8192u/r8192U_core.c | 26 +- + drivers/staging/rtl8192u/r8192U_dm.c | 2 +- + drivers/staging/rtl8712/ieee80211.h | 29 - + drivers/staging/rtl8712/os_intfs.c | 8 +- + drivers/staging/rtl8712/rtl8712_recv.c | 3 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 2 +- + drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | 2 +- + drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c | 2 +- + drivers/staging/rtl8723au/hal/odm.c | 4 +- + drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 2 +- + drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 4 +- + drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 2 +- + drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 4 +- + drivers/staging/rtl8723au/hal/rtl8723au_xmit.c | 2 +- + drivers/staging/rtl8723au/hal/usb_halinit.c | 2 +- + drivers/staging/rtl8723au/include/odm_debug.h | 2 +- + drivers/staging/rtl8723au/include/rtl8723a_hal.h | 2 +- + drivers/staging/rtl8723au/include/rtw_cmd.h | 2 +- + drivers/staging/rtl8723au/include/rtw_mlme.h | 10 +- + drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 2 +- + drivers/staging/rtl8723au/include/sta_info.h | 2 +- + drivers/staging/rtl8723au/os_dep/os_intfs.c | 4 +- + drivers/staging/rts5208/rtsx.c | 2 +- + drivers/staging/rts5208/rtsx.h | 25 +- + drivers/staging/rts5208/rtsx_scsi.c | 8 +- + drivers/staging/skein/skein_api.h | 6 +- + drivers/staging/slicoss/TODO | 1 - + drivers/staging/slicoss/slic.h | 20 +- + drivers/staging/slicoss/slicoss.c | 130 +- + drivers/staging/sm750fb/TODO | 3 +- + drivers/staging/sm750fb/ddk750_chip.c | 6 +- + drivers/staging/sm750fb/ddk750_chip.h | 69 +- + drivers/staging/sm750fb/ddk750_help.h | 2 +- + drivers/staging/sm750fb/ddk750_mode.c | 2 +- + drivers/staging/sm750fb/ddk750_reg.h | 4 +- + drivers/staging/sm750fb/ddk750_sii164.c | 4 +- + drivers/staging/sm750fb/readme | 8 +- + drivers/staging/sm750fb/sm750.c | 54 +- + drivers/staging/sm750fb/sm750.h | 3 - + drivers/staging/sm750fb/sm750_accel.c | 4 +- + drivers/staging/sm750fb/sm750_hw.c | 3 +- + drivers/staging/sm750fb/sm750_hw.h | 2 +- + drivers/staging/sm7xxfb/sm7xxfb.c | 228 +- + drivers/staging/unisys/Kconfig | 9 +- + drivers/staging/unisys/Makefile | 7 +- + .../include/channels/controlframework.h | 62 - + .../include/diagnostics/appos_subsystems.h | 310 - + .../include/channels => include}/channel.h | 35 - + .../include/channels => include}/channel_guid.h | 0 + .../include/channels => include}/diagchannel.h | 0 + drivers/staging/unisys/include/guestlinuxdebug.h | 3 +- + .../include/channels => include}/iochannel.h | 381 +- + drivers/staging/unisys/include/periodic_work.h | 10 +- + drivers/staging/unisys/include/procobjecttree.h | 47 - + drivers/staging/unisys/include/sparstop.h | 30 - + drivers/staging/unisys/include/timskmod.h | 153 - + drivers/staging/unisys/include/uisqueue.h | 396 - + drivers/staging/unisys/include/uisthread.h | 42 - + drivers/staging/unisys/include/uisutils.h | 299 - + drivers/staging/unisys/include/vbushelper.h | 2 - + .../unisys/{common-spar => }/include/version.h | 0 + drivers/staging/unisys/include/visorbus.h | 223 + + drivers/staging/unisys/uislib/Kconfig | 10 - + drivers/staging/unisys/uislib/Makefile | 12 - + drivers/staging/unisys/uislib/uislib.c | 1372 ---- + drivers/staging/unisys/uislib/uisqueue.c | 322 - + drivers/staging/unisys/uislib/uisthread.c | 69 - + drivers/staging/unisys/uislib/uisutils.c | 137 - + drivers/staging/unisys/virthba/Kconfig | 13 - + drivers/staging/unisys/virthba/Makefile | 12 - + drivers/staging/unisys/virthba/virthba.c | 1572 ---- + drivers/staging/unisys/virthba/virthba.h | 27 - + drivers/staging/unisys/virtpci/Kconfig | 10 - + drivers/staging/unisys/virtpci/Makefile | 10 - + drivers/staging/unisys/virtpci/virtpci.c | 1394 ---- + drivers/staging/unisys/virtpci/virtpci.h | 103 - + drivers/staging/unisys/visorbus/Kconfig | 9 + + drivers/staging/unisys/visorbus/Makefile | 13 + + .../channels => visorbus}/controlvmchannel.h | 304 +- + .../controlvmcompletionstatus.h | 0 + .../include => visorbus}/iovmcall_gnuc.h | 0 + .../unisys/{visorutil => visorbus}/periodic_work.c | 56 +- + .../include/channels => visorbus}/vbuschannel.h | 2 +- + .../include => visorbus}/vbusdeviceinfo.h | 0 + drivers/staging/unisys/visorbus/visorbus_main.c | 1791 +++++ + drivers/staging/unisys/visorbus/visorbus_private.h | 142 + + .../visorchannel.c} | 444 +- + .../visorchipset.c} | 1504 ++-- + .../include => visorbus}/vmcallinterface.h | 4 +- + drivers/staging/unisys/visorchannel/Kconfig | 1 - + drivers/staging/unisys/visorchannel/Makefile | 2 - + drivers/staging/unisys/visorchannel/globals.h | 2 - + drivers/staging/unisys/visorchannel/visorchannel.h | 76 - + drivers/staging/unisys/visorchipset/Kconfig | 11 - + drivers/staging/unisys/visorchipset/Makefile | 15 - + drivers/staging/unisys/visorchipset/file.c | 160 - + drivers/staging/unisys/visorchipset/file.h | 27 - + drivers/staging/unisys/visorchipset/globals.h | 42 - + drivers/staging/unisys/visorchipset/parser.c | 430 -- + drivers/staging/unisys/visorchipset/parser.h | 46 - + drivers/staging/unisys/visorchipset/visorchipset.h | 236 - + .../unisys/visorchipset/visorchipset_umode.h | 35 - + drivers/staging/unisys/visorutil/Kconfig | 9 - + drivers/staging/unisys/visorutil/Makefile | 9 - + drivers/staging/unisys/visorutil/charqueue.c | 127 - + drivers/staging/unisys/visorutil/charqueue.h | 37 - + drivers/staging/unisys/visorutil/memregion.h | 43 - + .../staging/unisys/visorutil/memregion_direct.c | 207 - + drivers/staging/unisys/visorutil/visorkmodutils.c | 71 - + drivers/staging/vt6655/Makefile | 1 - + drivers/staging/vt6655/device.h | 11 +- + drivers/staging/vt6655/device_main.c | 177 +- + drivers/staging/vt6655/mac.c | 49 +- + drivers/staging/vt6655/mib.c | 139 - + drivers/staging/vt6655/mib.h | 82 - + drivers/staging/vt6655/rxtx.c | 2 +- + drivers/staging/vt6656/device.h | 2 +- + drivers/staging/wilc1000/Kconfig | 58 + + drivers/staging/wilc1000/Makefile | 34 + + drivers/staging/wilc1000/TODO | 14 + + drivers/staging/wilc1000/coreconfigsimulator.h | 20 + + drivers/staging/wilc1000/coreconfigurator.c | 2186 ++++++ + drivers/staging/wilc1000/coreconfigurator.h | 498 ++ + drivers/staging/wilc1000/fifo_buffer.c | 134 + + drivers/staging/wilc1000/fifo_buffer.h | 23 + + drivers/staging/wilc1000/host_interface.c | 8043 ++++++++++++++++++++ + drivers/staging/wilc1000/host_interface.h | 1344 ++++ + drivers/staging/wilc1000/itypes.h | 60 + + drivers/staging/wilc1000/linux_mon.c | 643 ++ + drivers/staging/wilc1000/linux_wlan.c | 2871 +++++++ + drivers/staging/wilc1000/linux_wlan_common.h | 170 + + drivers/staging/wilc1000/linux_wlan_sdio.c | 249 + + drivers/staging/wilc1000/linux_wlan_sdio.h | 14 + + drivers/staging/wilc1000/linux_wlan_spi.c | 507 ++ + drivers/staging/wilc1000/linux_wlan_spi.h | 14 + + drivers/staging/wilc1000/wilc_debugfs.c | 185 + + drivers/staging/wilc1000/wilc_errorsupport.h | 67 + + drivers/staging/wilc1000/wilc_exported_buf.c | 76 + + drivers/staging/wilc1000/wilc_log.h | 47 + + drivers/staging/wilc1000/wilc_memory.c | 58 + + drivers/staging/wilc1000/wilc_memory.h | 237 + + drivers/staging/wilc1000/wilc_msgqueue.c | 190 + + drivers/staging/wilc1000/wilc_msgqueue.h | 103 + + drivers/staging/wilc1000/wilc_osconfig.h | 9 + + drivers/staging/wilc1000/wilc_oswrapper.h | 59 + + drivers/staging/wilc1000/wilc_platform.h | 52 + + drivers/staging/wilc1000/wilc_sdio.c | 1298 ++++ + drivers/staging/wilc1000/wilc_sleep.c | 18 + + drivers/staging/wilc1000/wilc_sleep.h | 17 + + drivers/staging/wilc1000/wilc_spi.c | 1475 ++++ + drivers/staging/wilc1000/wilc_strutils.c | 80 + + drivers/staging/wilc1000/wilc_strutils.h | 130 + + drivers/staging/wilc1000/wilc_timer.c | 45 + + drivers/staging/wilc1000/wilc_timer.h | 126 + + drivers/staging/wilc1000/wilc_type.h | 34 + + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4097 ++++++++++ + drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 129 + + drivers/staging/wilc1000/wilc_wfi_netdevice.c | 960 +++ + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 269 + + drivers/staging/wilc1000/wilc_wlan.c | 2432 ++++++ + drivers/staging/wilc1000/wilc_wlan.h | 321 + + drivers/staging/wilc1000/wilc_wlan_cfg.c | 643 ++ + drivers/staging/wilc1000/wilc_wlan_cfg.h | 33 + + drivers/staging/wilc1000/wilc_wlan_if.h | 991 +++ + drivers/staging/wlan-ng/p80211conv.c | 2 + + drivers/staging/wlan-ng/prism2sta.c | 23 +- + drivers/staging/xgifb/XGI_main_26.c | 27 +- + drivers/staging/xgifb/vb_setmode.c | 21 +- + drivers/tty/goldfish.c | 4 +- + include/linux/goldfish.h | 19 +- + include/linux/iio/iio.h | 3 + + include/linux/iio/types.h | 2 + + include/uapi/linux/iio/types.h | 2 + + tools/Makefile | 8 +- + tools/iio/Makefile | 4 +- + 590 files changed, 55270 insertions(+), 38680 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/berlin2_adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/imu/inv_mpu6050.txt + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/bmc150_magn.txt + create mode 100644 Documentation/devicetree/bindings/iio/temperature/mlx90614.txt + create mode 100644 drivers/iio/accel/stk8312.c + create mode 100644 drivers/iio/accel/stk8ba50.c + create mode 100644 drivers/iio/adc/berlin2-adc.c + create mode 100644 drivers/iio/dac/m62332.c + create mode 100644 drivers/iio/light/acpi-als.c + create mode 100644 drivers/iio/light/bh1750.c + create mode 100644 drivers/iio/light/stk3310.c + create mode 100644 drivers/iio/magnetometer/bmc150_magn.c + create mode 100644 drivers/iio/magnetometer/mmc35240.c + create mode 100644 drivers/staging/comedi/drivers/comedi_8255.c + create mode 100644 drivers/staging/fbtft/fb_hx8357d.c + create mode 100644 drivers/staging/fbtft/fb_hx8357d.h + delete mode 100644 drivers/staging/i2o/Kconfig + delete mode 100644 drivers/staging/i2o/Makefile + delete mode 100644 drivers/staging/i2o/README + delete mode 100644 drivers/staging/i2o/README.ioctl + delete mode 100644 drivers/staging/i2o/bus-osm.c + delete mode 100644 drivers/staging/i2o/config-osm.c + delete mode 100644 drivers/staging/i2o/core.h + delete mode 100644 drivers/staging/i2o/debug.c + delete mode 100644 drivers/staging/i2o/device.c + delete mode 100644 drivers/staging/i2o/driver.c + delete mode 100644 drivers/staging/i2o/exec-osm.c + delete mode 100644 drivers/staging/i2o/i2o.h + delete mode 100644 drivers/staging/i2o/i2o_block.c + delete mode 100644 drivers/staging/i2o/i2o_block.h + delete mode 100644 drivers/staging/i2o/i2o_config.c + delete mode 100644 drivers/staging/i2o/i2o_proc.c + delete mode 100644 drivers/staging/i2o/i2o_scsi.c + delete mode 100644 drivers/staging/i2o/iop.c + delete mode 100644 drivers/staging/i2o/memory.c + delete mode 100644 drivers/staging/i2o/pci.c + delete mode 100644 drivers/staging/lustre/lustre/include/lustre_quota.h + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-mem.c + delete mode 100644 drivers/staging/lustre/lustre/obdecho/lproc_echo.c + create mode 100644 drivers/staging/lustre/sysfs-fs-lustre + delete mode 100644 drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h + delete mode 100644 drivers/staging/rtl8192e/rtl8192e/rtl_crypto.h + delete mode 100644 drivers/staging/rtl8192e/rtllib_crypt.c + delete mode 100644 drivers/staging/rtl8192e/rtllib_crypt.h + delete mode 100644 drivers/staging/unisys/common-spar/include/channels/controlframework.h + delete mode 100644 drivers/staging/unisys/common-spar/include/diagnostics/appos_subsystems.h + rename drivers/staging/unisys/{common-spar/include/channels => include}/channel.h (94%) + rename drivers/staging/unisys/{common-spar/include/channels => include}/channel_guid.h (100%) + rename drivers/staging/unisys/{common-spar/include/channels => include}/diagchannel.h (100%) + rename drivers/staging/unisys/{common-spar/include/channels => include}/iochannel.h (60%) + delete mode 100644 drivers/staging/unisys/include/procobjecttree.h + delete mode 100644 drivers/staging/unisys/include/sparstop.h + delete mode 100644 drivers/staging/unisys/include/timskmod.h + delete mode 100644 drivers/staging/unisys/include/uisqueue.h + delete mode 100644 drivers/staging/unisys/include/uisthread.h + delete mode 100644 drivers/staging/unisys/include/uisutils.h + rename drivers/staging/unisys/{common-spar => }/include/version.h (100%) + create mode 100644 drivers/staging/unisys/include/visorbus.h + delete mode 100644 drivers/staging/unisys/uislib/Kconfig + delete mode 100644 drivers/staging/unisys/uislib/Makefile + delete mode 100644 drivers/staging/unisys/uislib/uislib.c + delete mode 100644 drivers/staging/unisys/uislib/uisqueue.c + delete mode 100644 drivers/staging/unisys/uislib/uisthread.c + delete mode 100644 drivers/staging/unisys/uislib/uisutils.c + delete mode 100644 drivers/staging/unisys/virthba/Kconfig + delete mode 100644 drivers/staging/unisys/virthba/Makefile + delete mode 100644 drivers/staging/unisys/virthba/virthba.c + delete mode 100644 drivers/staging/unisys/virthba/virthba.h + delete mode 100644 drivers/staging/unisys/virtpci/Kconfig + delete mode 100644 drivers/staging/unisys/virtpci/Makefile + delete mode 100644 drivers/staging/unisys/virtpci/virtpci.c + delete mode 100644 drivers/staging/unisys/virtpci/virtpci.h + create mode 100644 drivers/staging/unisys/visorbus/Kconfig + create mode 100644 drivers/staging/unisys/visorbus/Makefile + rename drivers/staging/unisys/{common-spar/include/channels => visorbus}/controlvmchannel.h (63%) + rename drivers/staging/unisys/{common-spar/include => visorbus}/controlvmcompletionstatus.h (100%) + rename drivers/staging/unisys/{common-spar/include => visorbus}/iovmcall_gnuc.h (100%) + rename drivers/staging/unisys/{visorutil => visorbus}/periodic_work.c (84%) + rename drivers/staging/unisys/{common-spar/include/channels => visorbus}/vbuschannel.h (98%) + rename drivers/staging/unisys/{common-spar/include => visorbus}/vbusdeviceinfo.h (100%) + create mode 100644 drivers/staging/unisys/visorbus/visorbus_main.c + create mode 100644 drivers/staging/unisys/visorbus/visorbus_private.h + rename drivers/staging/unisys/{visorchannel/visorchannel_funcs.c => visorbus/visorchannel.c} (61%) + rename drivers/staging/unisys/{visorchipset/visorchipset_main.c => visorbus/visorchipset.c} (66%) + rename drivers/staging/unisys/{common-spar/include => visorbus}/vmcallinterface.h (99%) + delete mode 100644 drivers/staging/unisys/visorchannel/visorchannel.h + delete mode 100644 drivers/staging/unisys/visorchipset/Kconfig + delete mode 100644 drivers/staging/unisys/visorchipset/Makefile + delete mode 100644 drivers/staging/unisys/visorchipset/file.c + delete mode 100644 drivers/staging/unisys/visorchipset/file.h + delete mode 100644 drivers/staging/unisys/visorchipset/globals.h + delete mode 100644 drivers/staging/unisys/visorchipset/parser.c + delete mode 100644 drivers/staging/unisys/visorchipset/parser.h + delete mode 100644 drivers/staging/unisys/visorchipset/visorchipset.h + delete mode 100644 drivers/staging/unisys/visorchipset/visorchipset_umode.h + delete mode 100644 drivers/staging/unisys/visorutil/Kconfig + delete mode 100644 drivers/staging/unisys/visorutil/Makefile + delete mode 100644 drivers/staging/unisys/visorutil/charqueue.c + delete mode 100644 drivers/staging/unisys/visorutil/charqueue.h + delete mode 100644 drivers/staging/unisys/visorutil/memregion.h + delete mode 100644 drivers/staging/unisys/visorutil/memregion_direct.c + delete mode 100644 drivers/staging/unisys/visorutil/visorkmodutils.c + delete mode 100644 drivers/staging/vt6655/mib.c + delete mode 100644 drivers/staging/vt6655/mib.h + create mode 100644 drivers/staging/wilc1000/Kconfig + create mode 100644 drivers/staging/wilc1000/Makefile + create mode 100644 drivers/staging/wilc1000/TODO + create mode 100644 drivers/staging/wilc1000/coreconfigsimulator.h + create mode 100644 drivers/staging/wilc1000/coreconfigurator.c + create mode 100644 drivers/staging/wilc1000/coreconfigurator.h + create mode 100644 drivers/staging/wilc1000/fifo_buffer.c + create mode 100644 drivers/staging/wilc1000/fifo_buffer.h + create mode 100644 drivers/staging/wilc1000/host_interface.c + create mode 100644 drivers/staging/wilc1000/host_interface.h + create mode 100644 drivers/staging/wilc1000/itypes.h + create mode 100644 drivers/staging/wilc1000/linux_mon.c + create mode 100644 drivers/staging/wilc1000/linux_wlan.c + create mode 100644 drivers/staging/wilc1000/linux_wlan_common.h + create mode 100644 drivers/staging/wilc1000/linux_wlan_sdio.c + create mode 100644 drivers/staging/wilc1000/linux_wlan_sdio.h + create mode 100644 drivers/staging/wilc1000/linux_wlan_spi.c + create mode 100644 drivers/staging/wilc1000/linux_wlan_spi.h + create mode 100644 drivers/staging/wilc1000/wilc_debugfs.c + create mode 100644 drivers/staging/wilc1000/wilc_errorsupport.h + create mode 100644 drivers/staging/wilc1000/wilc_exported_buf.c + create mode 100644 drivers/staging/wilc1000/wilc_log.h + create mode 100644 drivers/staging/wilc1000/wilc_memory.c + create mode 100644 drivers/staging/wilc1000/wilc_memory.h + create mode 100644 drivers/staging/wilc1000/wilc_msgqueue.c + create mode 100644 drivers/staging/wilc1000/wilc_msgqueue.h + create mode 100644 drivers/staging/wilc1000/wilc_osconfig.h + create mode 100644 drivers/staging/wilc1000/wilc_oswrapper.h + create mode 100644 drivers/staging/wilc1000/wilc_platform.h + create mode 100644 drivers/staging/wilc1000/wilc_sdio.c + create mode 100644 drivers/staging/wilc1000/wilc_sleep.c + create mode 100644 drivers/staging/wilc1000/wilc_sleep.h + create mode 100644 drivers/staging/wilc1000/wilc_spi.c + create mode 100644 drivers/staging/wilc1000/wilc_strutils.c + create mode 100644 drivers/staging/wilc1000/wilc_strutils.h + create mode 100644 drivers/staging/wilc1000/wilc_timer.c + create mode 100644 drivers/staging/wilc1000/wilc_timer.h + create mode 100644 drivers/staging/wilc1000/wilc_type.h + create mode 100644 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c + create mode 100644 drivers/staging/wilc1000/wilc_wfi_cfgoperations.h + create mode 100644 drivers/staging/wilc1000/wilc_wfi_netdevice.c + create mode 100644 drivers/staging/wilc1000/wilc_wfi_netdevice.h + create mode 100644 drivers/staging/wilc1000/wilc_wlan.c + create mode 100644 drivers/staging/wilc1000/wilc_wlan.h + create mode 100644 drivers/staging/wilc1000/wilc_wlan_cfg.c + create mode 100644 drivers/staging/wilc1000/wilc_wlan_cfg.h + create mode 100644 drivers/staging/wilc1000/wilc_wlan_if.h +$ git am -3 ../patches/0001-staging-wilc1000-fix-call-to-cfg80211_disconnecteddu.patch +Applying: staging: wilc1000: fix call to cfg80211_disconnecteddue to API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +$ git add -A . +$ git commit -v -a --amend +[master e97b69bb6912] Merge remote-tracking branch 'staging/staging-next' + Date: Thu Jun 11 17:05:28 2015 +1000 +$ git am -3 ../patches/0001-staging-disable-the-WILC1000-driver.patch +Applying: staging: disable the WILC1000 driver +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/wilc1000/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 356eabcca334] Merge remote-tracking branch 'staging/staging-next' + Date: Thu Jun 11 17:05:28 2015 +1000 +Merging char-misc/char-misc-next (00465f4c8486 Merge tag 'extcon-next-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next) +$ git merge char-misc/char-misc-next +Resolved 'include/dt-bindings/mfd/arizona.h' using previous resolution. +Resolved 'include/linux/mfd/axp20x.h' using previous resolution. +Auto-merging scripts/mod/file2alias.c +Auto-merging scripts/mod/devicetable-offsets.c +Auto-merging include/uapi/linux/Kbuild +Auto-merging include/linux/mod_devicetable.h +Auto-merging include/linux/mfd/axp20x.h +CONFLICT (content): Merge conflict in include/linux/mfd/axp20x.h +Auto-merging include/linux/mfd/arizona/pdata.h +Auto-merging include/dt-bindings/mfd/arizona.h +CONFLICT (content): Merge conflict in include/dt-bindings/mfd/arizona.h +Auto-merging drivers/usb/phy/phy-tahvo.c +Auto-merging drivers/staging/panel/panel.c +Auto-merging drivers/platform/goldfish/goldfish_pipe.c +Auto-merging drivers/pcmcia/cs.c +Removing drivers/misc/carma/carma-fpga.c +Removing drivers/misc/carma/carma-fpga-program.c +Removing drivers/misc/carma/Makefile +Removing drivers/misc/carma/Kconfig +Auto-merging drivers/hwmon/dell-smm-hwmon.c +Auto-merging drivers/hwmon/Kconfig +Removing drivers/char/msm_smd_pkt.c +Auto-merging drivers/block/paride/pd.c +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/mfd/arizona.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b90e54ff0d70] Merge remote-tracking branch 'char-misc/char-misc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-bus-w1 | 11 + + Documentation/ABI/stable/sysfs-driver-w1_ds28ea00 | 6 + + .../ABI/testing/sysfs-bus-coresight-devices-etm4x | 450 ++++ + Documentation/ABI/testing/sysfs-bus-mei | 16 +- + .../devicetree/bindings/arm/coresight.txt | 12 +- + Documentation/devicetree/bindings/mfd/arizona.txt | 6 + + Documentation/mic/mic_overview.txt | 28 +- + Documentation/mic/mpssd/mpss | 24 +- + Documentation/mic/scif_overview.txt | 98 + + Documentation/w1/slaves/w1_therm | 11 +- + Documentation/w1/w1.generic | 30 +- + MAINTAINERS | 13 +- + arch/um/os-Linux/drivers/ethertap_user.c | 2 +- + arch/x86/Kconfig | 25 +- + drivers/block/paride/paride.c | 57 +- + drivers/block/paride/paride.h | 2 + + drivers/block/paride/pcd.c | 9 + + drivers/block/paride/pd.c | 12 +- + drivers/block/paride/pf.c | 7 + + drivers/block/paride/pg.c | 8 + + drivers/block/paride/pt.c | 8 + + drivers/char/Kconfig | 8 - + drivers/char/Makefile | 2 - + drivers/char/misc.c | 23 +- + drivers/char/msm_smd_pkt.c | 465 ---- + drivers/char/pcmcia/synclink_cs.c | 2 +- + drivers/char/snsc.c | 4 +- + drivers/char/virtio_console.c | 4 +- + drivers/char/xillybus/Kconfig | 2 +- + drivers/extcon/Kconfig | 25 +- + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-adc-jack.c | 13 - + drivers/extcon/extcon-arizona.c | 88 +- + drivers/extcon/extcon-axp288.c | 381 +++ + drivers/extcon/extcon-gpio.c | 1 - + drivers/extcon/extcon-max14577.c | 60 +- + drivers/extcon/extcon-max77693.c | 140 +- + drivers/extcon/extcon-max77843.c | 89 +- + drivers/extcon/extcon-max8997.c | 64 +- + drivers/extcon/extcon-palmas.c | 23 +- + drivers/extcon/extcon-rt8973a.c | 55 +- + drivers/extcon/extcon-sm5502.c | 33 +- + drivers/extcon/extcon-usb-gpio.c | 35 +- + drivers/extcon/extcon.c | 316 ++- + drivers/hv/Makefile | 2 +- + drivers/hv/channel.c | 13 +- + drivers/hv/channel_mgmt.c | 156 +- + drivers/hv/connection.c | 13 +- + drivers/hv/hv_balloon.c | 4 +- + drivers/hv/hv_fcopy.c | 287 +-- + drivers/hv/hv_kvp.c | 192 +- + drivers/hv/hv_snapshot.c | 168 +- + drivers/hv/hv_utils_transport.c | 276 ++ + drivers/hv/hv_utils_transport.h | 51 + + drivers/hv/hyperv_vmbus.h | 31 + + drivers/hv/vmbus_drv.c | 21 +- + drivers/hwmon/Kconfig | 11 + + drivers/hwmon/Makefile | 1 + + drivers/{char/i8k.c => hwmon/dell-smm-hwmon.c} | 156 +- + drivers/hwtracing/coresight/Kconfig | 19 + + drivers/hwtracing/coresight/Makefile | 2 + + drivers/hwtracing/coresight/coresight-etb10.c | 79 +- + drivers/hwtracing/coresight/coresight-etm.h | 4 +- + drivers/hwtracing/coresight/coresight-etm3x.c | 112 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 2701 ++++++++++++++++++++ + drivers/hwtracing/coresight/coresight-etm4x.h | 391 +++ + drivers/hwtracing/coresight/coresight-funnel.c | 61 +- + .../coresight/coresight-replicator-qcom.c | 214 ++ + drivers/hwtracing/coresight/coresight-replicator.c | 71 +- + drivers/hwtracing/coresight/coresight-tmc.c | 31 +- + drivers/hwtracing/coresight/coresight-tpiu.c | 60 +- + drivers/hwtracing/coresight/of_coresight.c | 2 +- + drivers/i2c/busses/i2c-parport.c | 38 +- + drivers/misc/Kconfig | 1 - + drivers/misc/Makefile | 1 - + drivers/misc/carma/Kconfig | 15 - + drivers/misc/carma/Makefile | 2 - + drivers/misc/carma/carma-fpga-program.c | 1182 --------- + drivers/misc/carma/carma-fpga.c | 1507 ----------- + drivers/misc/mei/amthif.c | 28 +- + drivers/misc/mei/bus.c | 150 +- + drivers/misc/mei/client.c | 468 ++-- + drivers/misc/mei/client.h | 114 +- + drivers/misc/mei/debugfs.c | 15 +- + drivers/misc/mei/hbm.c | 16 +- + drivers/misc/mei/hw-txe.c | 20 +- + drivers/misc/mei/init.c | 8 +- + drivers/misc/mei/interrupt.c | 95 +- + drivers/misc/mei/main.c | 57 +- + drivers/misc/mei/mei_dev.h | 91 +- + drivers/misc/mei/nfc.c | 223 +- + drivers/misc/mei/pci-txe.c | 2 +- + drivers/misc/mei/wd.c | 22 +- + drivers/misc/mic/Kconfig | 40 +- + drivers/misc/mic/Makefile | 3 +- + drivers/misc/mic/bus/Makefile | 1 + + drivers/misc/mic/bus/scif_bus.c | 210 ++ + drivers/misc/mic/bus/scif_bus.h | 129 + + drivers/misc/mic/card/mic_device.c | 132 +- + drivers/misc/mic/card/mic_device.h | 11 +- + drivers/misc/mic/card/mic_x100.c | 61 +- + drivers/misc/mic/card/mic_x100.h | 1 + + drivers/misc/mic/common/mic_dev.h | 3 + + drivers/misc/mic/host/mic_boot.c | 264 +- + drivers/misc/mic/host/mic_debugfs.c | 13 + + drivers/misc/mic/host/mic_device.h | 11 +- + drivers/misc/mic/host/mic_intr.h | 3 +- + drivers/misc/mic/host/mic_main.c | 6 + + drivers/misc/mic/host/mic_smpt.c | 7 +- + drivers/misc/mic/host/mic_smpt.h | 1 + + drivers/misc/mic/host/mic_virtio.c | 6 +- + drivers/misc/mic/host/mic_x100.c | 3 +- + drivers/misc/mic/scif/Makefile | 15 + + drivers/misc/mic/scif/scif_api.c | 1276 +++++++++ + drivers/misc/mic/scif/scif_debugfs.c | 85 + + drivers/misc/mic/scif/scif_epd.c | 353 +++ + drivers/misc/mic/scif/scif_epd.h | 160 ++ + drivers/misc/mic/scif/scif_fd.c | 303 +++ + drivers/misc/mic/scif/scif_main.c | 392 +++ + drivers/misc/mic/scif/scif_main.h | 254 ++ + drivers/misc/mic/scif/scif_map.h | 113 + + drivers/misc/mic/scif/scif_nm.c | 237 ++ + drivers/misc/mic/scif/scif_nodeqp.c | 1312 ++++++++++ + drivers/misc/mic/scif/scif_nodeqp.h | 183 ++ + drivers/misc/mic/scif/scif_peer_bus.c | 124 + + drivers/misc/mic/scif/scif_peer_bus.h | 65 + + drivers/misc/mic/scif/scif_ports.c | 124 + + drivers/misc/mic/scif/scif_rb.c | 248 ++ + drivers/misc/mic/scif/scif_rb.h | 100 + + drivers/misc/ti-st/st_kim.c | 3 +- + drivers/nfc/mei_phy.c | 295 ++- + drivers/nfc/mei_phy.h | 38 +- + drivers/nfc/microread/mei.c | 2 +- + drivers/nfc/pn544/mei.c | 2 +- + drivers/parport/parport_pc.c | 4 +- + drivers/parport/procfs.c | 15 +- + drivers/parport/share.c | 345 ++- + drivers/pcmcia/cs.c | 10 +- + drivers/platform/goldfish/goldfish_pipe.c | 2 +- + drivers/spmi/Kconfig | 1 + + drivers/staging/panel/panel.c | 14 +- + drivers/uio/uio.c | 3 +- + drivers/usb/phy/phy-tahvo.c | 9 +- + drivers/w1/masters/ds2482.c | 1 + + drivers/w1/slaves/w1_therm.c | 162 +- + drivers/w1/w1.c | 17 +- + include/dt-bindings/mfd/arizona.h | 4 + + include/linux/extcon.h | 142 +- + include/linux/extcon/extcon-adc-jack.h | 5 +- + include/linux/hyperv.h | 48 +- + include/linux/mei_cl_bus.h | 38 +- + include/linux/mfd/arizona/pdata.h | 3 + + include/linux/mfd/axp20x.h | 5 + + include/linux/mod_devicetable.h | 13 + + include/linux/parport.h | 43 +- + include/linux/scif.h | 993 +++++++ + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/hyperv.h | 8 +- + include/uapi/linux/mic_common.h | 12 + + include/uapi/linux/scif_ioctl.h | 130 + + lib/lz4/lz4_decompress.c | 12 +- + scripts/checkkconfigsymbols.py | 34 +- + scripts/mod/devicetable-offsets.c | 1 + + scripts/mod/file2alias.c | 21 +- + tools/hv/hv_fcopy_daemon.c | 15 + + tools/hv/hv_kvp_daemon.c | 166 +- + tools/hv/hv_vss_daemon.c | 149 +- + 167 files changed, 15291 insertions(+), 5577 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-bus-w1 + create mode 100644 Documentation/ABI/stable/sysfs-driver-w1_ds28ea00 + create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x + create mode 100644 Documentation/mic/scif_overview.txt + delete mode 100644 drivers/char/msm_smd_pkt.c + create mode 100644 drivers/extcon/extcon-axp288.c + create mode 100644 drivers/hv/hv_utils_transport.c + create mode 100644 drivers/hv/hv_utils_transport.h + rename drivers/{char/i8k.c => hwmon/dell-smm-hwmon.c} (96%) + create mode 100644 drivers/hwtracing/coresight/coresight-etm4x.c + create mode 100644 drivers/hwtracing/coresight/coresight-etm4x.h + create mode 100644 drivers/hwtracing/coresight/coresight-replicator-qcom.c + delete mode 100644 drivers/misc/carma/Kconfig + delete mode 100644 drivers/misc/carma/Makefile + delete mode 100644 drivers/misc/carma/carma-fpga-program.c + delete mode 100644 drivers/misc/carma/carma-fpga.c + create mode 100644 drivers/misc/mic/bus/scif_bus.c + create mode 100644 drivers/misc/mic/bus/scif_bus.h + create mode 100644 drivers/misc/mic/scif/Makefile + create mode 100644 drivers/misc/mic/scif/scif_api.c + create mode 100644 drivers/misc/mic/scif/scif_debugfs.c + create mode 100644 drivers/misc/mic/scif/scif_epd.c + create mode 100644 drivers/misc/mic/scif/scif_epd.h + create mode 100644 drivers/misc/mic/scif/scif_fd.c + create mode 100644 drivers/misc/mic/scif/scif_main.c + create mode 100644 drivers/misc/mic/scif/scif_main.h + create mode 100644 drivers/misc/mic/scif/scif_map.h + create mode 100644 drivers/misc/mic/scif/scif_nm.c + create mode 100644 drivers/misc/mic/scif/scif_nodeqp.c + create mode 100644 drivers/misc/mic/scif/scif_nodeqp.h + create mode 100644 drivers/misc/mic/scif/scif_peer_bus.c + create mode 100644 drivers/misc/mic/scif/scif_peer_bus.h + create mode 100644 drivers/misc/mic/scif/scif_ports.c + create mode 100644 drivers/misc/mic/scif/scif_rb.c + create mode 100644 drivers/misc/mic/scif/scif_rb.h + create mode 100644 include/linux/scif.h + create mode 100644 include/uapi/linux/scif_ioctl.h +$ git am -3 ../patches/0001-power-axp288_charger-fix-for-AIP-change.patch +Applying: power: axp288_charger: fix for API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/power/axp288_charger.c +$ git add -A . +$ git commit -v -a --amend +[master 24ba02d5aaf2] Merge remote-tracking branch 'char-misc/char-misc-next' + Date: Thu Jun 11 17:07:49 2015 +1000 +Merging extcon/extcon-next (f8df88081183 extcon: Remove optional print_name() function pointer of extcon_dev) +$ git merge extcon/extcon-next +Already up-to-date. +Merging kdbus/kdbus (cf15adc8b481 kdbus: use FIELD_SIZEOF in kdbus_member_set_user macro) +$ git merge kdbus/kdbus +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/Kbuild +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/ioctl/ioctl-number.txt +Merge made by the 'recursive' strategy. + Documentation/Makefile | 2 +- + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/kdbus/.gitignore | 2 + + Documentation/kdbus/Makefile | 40 + + Documentation/kdbus/kdbus.bus.xml | 359 ++++ + Documentation/kdbus/kdbus.connection.xml | 1250 +++++++++++++ + Documentation/kdbus/kdbus.endpoint.xml | 429 +++++ + Documentation/kdbus/kdbus.fs.xml | 124 ++ + Documentation/kdbus/kdbus.item.xml | 839 +++++++++ + Documentation/kdbus/kdbus.match.xml | 555 ++++++ + Documentation/kdbus/kdbus.message.xml | 1276 +++++++++++++ + Documentation/kdbus/kdbus.name.xml | 711 +++++++ + Documentation/kdbus/kdbus.policy.xml | 406 ++++ + Documentation/kdbus/kdbus.pool.xml | 326 ++++ + Documentation/kdbus/kdbus.xml | 1012 ++++++++++ + Documentation/kdbus/stylesheet.xsl | 16 + + MAINTAINERS | 13 + + Makefile | 1 + + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/kdbus.h | 979 ++++++++++ + include/uapi/linux/magic.h | 2 + + init/Kconfig | 13 + + ipc/Makefile | 2 +- + ipc/kdbus/Makefile | 22 + + ipc/kdbus/bus.c | 542 ++++++ + ipc/kdbus/bus.h | 101 + + ipc/kdbus/connection.c | 2179 ++++++++++++++++++++++ + ipc/kdbus/connection.h | 257 +++ + ipc/kdbus/domain.c | 296 +++ + ipc/kdbus/domain.h | 77 + + ipc/kdbus/endpoint.c | 275 +++ + ipc/kdbus/endpoint.h | 67 + + ipc/kdbus/fs.c | 510 +++++ + ipc/kdbus/fs.h | 28 + + ipc/kdbus/handle.c | 702 +++++++ + ipc/kdbus/handle.h | 90 + + ipc/kdbus/item.c | 333 ++++ + ipc/kdbus/item.h | 64 + + ipc/kdbus/limits.h | 64 + + ipc/kdbus/main.c | 114 ++ + ipc/kdbus/match.c | 559 ++++++ + ipc/kdbus/match.h | 35 + + ipc/kdbus/message.c | 640 +++++++ + ipc/kdbus/message.h | 135 ++ + ipc/kdbus/metadata.c | 1184 ++++++++++++ + ipc/kdbus/metadata.h | 55 + + ipc/kdbus/names.c | 772 ++++++++ + ipc/kdbus/names.h | 74 + + ipc/kdbus/node.c | 897 +++++++++ + ipc/kdbus/node.h | 86 + + ipc/kdbus/notify.c | 248 +++ + ipc/kdbus/notify.h | 30 + + ipc/kdbus/policy.c | 489 +++++ + ipc/kdbus/policy.h | 51 + + ipc/kdbus/pool.c | 728 ++++++++ + ipc/kdbus/pool.h | 46 + + ipc/kdbus/queue.c | 678 +++++++ + ipc/kdbus/queue.h | 92 + + ipc/kdbus/reply.c | 256 +++ + ipc/kdbus/reply.h | 68 + + ipc/kdbus/util.c | 156 ++ + ipc/kdbus/util.h | 73 + + samples/Kconfig | 7 + + samples/Makefile | 3 +- + samples/kdbus/.gitignore | 1 + + samples/kdbus/Makefile | 9 + + samples/kdbus/kdbus-api.h | 114 ++ + samples/kdbus/kdbus-workers.c | 1345 +++++++++++++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/kdbus/.gitignore | 1 + + tools/testing/selftests/kdbus/Makefile | 49 + + tools/testing/selftests/kdbus/kdbus-enum.c | 94 + + tools/testing/selftests/kdbus/kdbus-enum.h | 14 + + tools/testing/selftests/kdbus/kdbus-test.c | 900 +++++++++ + tools/testing/selftests/kdbus/kdbus-test.h | 83 + + tools/testing/selftests/kdbus/kdbus-util.c | 1615 ++++++++++++++++ + tools/testing/selftests/kdbus/kdbus-util.h | 222 +++ + tools/testing/selftests/kdbus/test-activator.c | 318 ++++ + tools/testing/selftests/kdbus/test-benchmark.c | 451 +++++ + tools/testing/selftests/kdbus/test-bus.c | 175 ++ + tools/testing/selftests/kdbus/test-chat.c | 122 ++ + tools/testing/selftests/kdbus/test-connection.c | 606 ++++++ + tools/testing/selftests/kdbus/test-daemon.c | 65 + + tools/testing/selftests/kdbus/test-endpoint.c | 352 ++++ + tools/testing/selftests/kdbus/test-fd.c | 789 ++++++++ + tools/testing/selftests/kdbus/test-free.c | 64 + + tools/testing/selftests/kdbus/test-match.c | 441 +++++ + tools/testing/selftests/kdbus/test-message.c | 731 ++++++++ + tools/testing/selftests/kdbus/test-metadata-ns.c | 506 +++++ + tools/testing/selftests/kdbus/test-monitor.c | 176 ++ + tools/testing/selftests/kdbus/test-names.c | 194 ++ + tools/testing/selftests/kdbus/test-policy-ns.c | 632 +++++++ + tools/testing/selftests/kdbus/test-policy-priv.c | 1269 +++++++++++++ + tools/testing/selftests/kdbus/test-policy.c | 80 + + tools/testing/selftests/kdbus/test-sync.c | 369 ++++ + tools/testing/selftests/kdbus/test-timeout.c | 99 + + 96 files changed, 33326 insertions(+), 3 deletions(-) + create mode 100644 Documentation/kdbus/.gitignore + create mode 100644 Documentation/kdbus/Makefile + create mode 100644 Documentation/kdbus/kdbus.bus.xml + create mode 100644 Documentation/kdbus/kdbus.connection.xml + create mode 100644 Documentation/kdbus/kdbus.endpoint.xml + create mode 100644 Documentation/kdbus/kdbus.fs.xml + create mode 100644 Documentation/kdbus/kdbus.item.xml + create mode 100644 Documentation/kdbus/kdbus.match.xml + create mode 100644 Documentation/kdbus/kdbus.message.xml + create mode 100644 Documentation/kdbus/kdbus.name.xml + create mode 100644 Documentation/kdbus/kdbus.policy.xml + create mode 100644 Documentation/kdbus/kdbus.pool.xml + create mode 100644 Documentation/kdbus/kdbus.xml + create mode 100644 Documentation/kdbus/stylesheet.xsl + create mode 100644 include/uapi/linux/kdbus.h + create mode 100644 ipc/kdbus/Makefile + create mode 100644 ipc/kdbus/bus.c + create mode 100644 ipc/kdbus/bus.h + create mode 100644 ipc/kdbus/connection.c + create mode 100644 ipc/kdbus/connection.h + create mode 100644 ipc/kdbus/domain.c + create mode 100644 ipc/kdbus/domain.h + create mode 100644 ipc/kdbus/endpoint.c + create mode 100644 ipc/kdbus/endpoint.h + create mode 100644 ipc/kdbus/fs.c + create mode 100644 ipc/kdbus/fs.h + create mode 100644 ipc/kdbus/handle.c + create mode 100644 ipc/kdbus/handle.h + create mode 100644 ipc/kdbus/item.c + create mode 100644 ipc/kdbus/item.h + create mode 100644 ipc/kdbus/limits.h + create mode 100644 ipc/kdbus/main.c + create mode 100644 ipc/kdbus/match.c + create mode 100644 ipc/kdbus/match.h + create mode 100644 ipc/kdbus/message.c + create mode 100644 ipc/kdbus/message.h + create mode 100644 ipc/kdbus/metadata.c + create mode 100644 ipc/kdbus/metadata.h + create mode 100644 ipc/kdbus/names.c + create mode 100644 ipc/kdbus/names.h + create mode 100644 ipc/kdbus/node.c + create mode 100644 ipc/kdbus/node.h + create mode 100644 ipc/kdbus/notify.c + create mode 100644 ipc/kdbus/notify.h + create mode 100644 ipc/kdbus/policy.c + create mode 100644 ipc/kdbus/policy.h + create mode 100644 ipc/kdbus/pool.c + create mode 100644 ipc/kdbus/pool.h + create mode 100644 ipc/kdbus/queue.c + create mode 100644 ipc/kdbus/queue.h + create mode 100644 ipc/kdbus/reply.c + create mode 100644 ipc/kdbus/reply.h + create mode 100644 ipc/kdbus/util.c + create mode 100644 ipc/kdbus/util.h + create mode 100644 samples/kdbus/.gitignore + create mode 100644 samples/kdbus/Makefile + create mode 100644 samples/kdbus/kdbus-api.h + create mode 100644 samples/kdbus/kdbus-workers.c + create mode 100644 tools/testing/selftests/kdbus/.gitignore + create mode 100644 tools/testing/selftests/kdbus/Makefile + create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.c + create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.h + create mode 100644 tools/testing/selftests/kdbus/kdbus-test.c + create mode 100644 tools/testing/selftests/kdbus/kdbus-test.h + create mode 100644 tools/testing/selftests/kdbus/kdbus-util.c + create mode 100644 tools/testing/selftests/kdbus/kdbus-util.h + create mode 100644 tools/testing/selftests/kdbus/test-activator.c + create mode 100644 tools/testing/selftests/kdbus/test-benchmark.c + create mode 100644 tools/testing/selftests/kdbus/test-bus.c + create mode 100644 tools/testing/selftests/kdbus/test-chat.c + create mode 100644 tools/testing/selftests/kdbus/test-connection.c + create mode 100644 tools/testing/selftests/kdbus/test-daemon.c + create mode 100644 tools/testing/selftests/kdbus/test-endpoint.c + create mode 100644 tools/testing/selftests/kdbus/test-fd.c + create mode 100644 tools/testing/selftests/kdbus/test-free.c + create mode 100644 tools/testing/selftests/kdbus/test-match.c + create mode 100644 tools/testing/selftests/kdbus/test-message.c + create mode 100644 tools/testing/selftests/kdbus/test-metadata-ns.c + create mode 100644 tools/testing/selftests/kdbus/test-monitor.c + create mode 100644 tools/testing/selftests/kdbus/test-names.c + create mode 100644 tools/testing/selftests/kdbus/test-policy-ns.c + create mode 100644 tools/testing/selftests/kdbus/test-policy-priv.c + create mode 100644 tools/testing/selftests/kdbus/test-policy.c + create mode 100644 tools/testing/selftests/kdbus/test-sync.c + create mode 100644 tools/testing/selftests/kdbus/test-timeout.c +Merging cgroup/for-next (4a705c5c786d cgroup: fix uninitialised iterator in for_each_subsys_which) +$ git merge cgroup/for-next +Auto-merging kernel/fork.c +Auto-merging init/Kconfig +Auto-merging include/linux/sched.h +Auto-merging include/linux/init_task.h +Auto-merging include/linux/cgroup.h +Merge made by the 'recursive' strategy. + include/linux/cgroup-defs.h | 500 ++++++++++++++++++++ + include/linux/cgroup.h | 1051 ++++++++++++------------------------------- + include/linux/init_task.h | 8 - + include/linux/sched.h | 65 +-- + init/Kconfig | 1 + + kernel/cgroup.c | 211 ++++----- + kernel/fork.c | 4 - + 7 files changed, 911 insertions(+), 929 deletions(-) + create mode 100644 include/linux/cgroup-defs.h +Merging scsi/for-next (641c43cc6909 lpfc: Update driver version for upstream patch set 10.6.0.1.) +$ git merge scsi/for-next +Resolved 'drivers/target/target_core_user.c' using previous resolution. +Auto-merging include/linux/libata.h +Auto-merging drivers/vhost/scsi.c +Auto-merging drivers/usb/storage/uas.c +Auto-merging drivers/usb/storage/scsiglue.c +Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c +Auto-merging drivers/target/target_core_xcopy.c +Auto-merging drivers/target/target_core_user.c +CONFLICT (content): Merge conflict in drivers/target/target_core_user.c +Auto-merging drivers/target/target_core_transport.c +Auto-merging drivers/target/target_core_sbc.c +Auto-merging drivers/target/target_core_rd.c +Auto-merging drivers/target/target_core_pscsi.h +Auto-merging drivers/target/target_core_pscsi.c +Auto-merging drivers/target/target_core_pr.c +Auto-merging drivers/target/target_core_iblock.c +Auto-merging drivers/target/target_core_file.c +Auto-merging drivers/target/target_core_device.c +Auto-merging drivers/target/target_core_alua.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Auto-merging drivers/staging/rts5208/rtsx.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_fusion.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/cxgbi/libcxgbi.c +Auto-merging drivers/scsi/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c27c8d328dcb] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-scsi_tape | 109 + + Documentation/scsi/st.txt | 59 + + Documentation/target/tcm_mod_builder.py | 7 +- + MAINTAINERS | 1 + + drivers/block/cciss_scsi.c | 1 - + drivers/firewire/sbp2.c | 1 - + drivers/infiniband/ulp/srpt/ib_srpt.c | 1 + + drivers/infiniband/ulp/srpt/ib_srpt.h | 2 +- + drivers/s390/scsi/zfcp_scsi.c | 1 - + drivers/scsi/Kconfig | 3 +- + drivers/scsi/Makefile | 1 + + drivers/scsi/NCR53c406a.c | 1 - + drivers/scsi/a100u2w.c | 1 - + drivers/scsi/aacraid/src.c | 2 +- + drivers/scsi/advansys.c | 1469 ++++-------- + drivers/scsi/aha152x.c | 1 - + drivers/scsi/aha1542.c | 1 - + drivers/scsi/aha1740.c | 1 - + drivers/scsi/aha1740.h | 1 - + drivers/scsi/aic94xx/aic94xx_init.c | 1 - + drivers/scsi/arm/arxescsi.c | 1 - + drivers/scsi/arm/cumana_2.c | 1 - + drivers/scsi/arm/eesox.c | 1 - + drivers/scsi/atp870u.c | 1 - + drivers/scsi/atp870u.h | 1 - + drivers/scsi/be2iscsi/be_cmds.c | 4 + + drivers/scsi/be2iscsi/be_cmds.h | 12 + + drivers/scsi/be2iscsi/be_main.c | 76 +- + drivers/scsi/be2iscsi/be_main.h | 6 +- + drivers/scsi/be2iscsi/be_mgmt.c | 69 + + drivers/scsi/be2iscsi/be_mgmt.h | 3 + + drivers/scsi/bnx2i/bnx2i_iscsi.c | 5 +- + drivers/scsi/csiostor/csio_hw.c | 1 + + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 20 +- + drivers/scsi/cxgbi/cxgb3i/cxgb3i.h | 2 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 52 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.h | 4 +- + drivers/scsi/cxgbi/libcxgbi.c | 20 +- + drivers/scsi/cxgbi/libcxgbi.h | 6 +- + drivers/scsi/dpt_i2o.c | 1 - + drivers/scsi/fdomain.c | 1 - + drivers/scsi/hpsa.c | 2794 ++++++++++++++++------- + drivers/scsi/hpsa.h | 19 +- + drivers/scsi/hpsa_cmd.h | 34 +- + drivers/scsi/imm.c | 1 - + drivers/scsi/initio.c | 1 - + drivers/scsi/ipr.h | 2 +- + drivers/scsi/ips.c | 9 +- + drivers/scsi/isci/init.c | 1 - + drivers/scsi/lpfc/lpfc.h | 2 + + drivers/scsi/lpfc/lpfc_crtn.h | 2 + + drivers/scsi/lpfc/lpfc_disc.h | 4 +- + drivers/scsi/lpfc/lpfc_els.c | 686 +++++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 168 +- + drivers/scsi/lpfc/lpfc_hw.h | 201 ++ + drivers/scsi/lpfc/lpfc_hw4.h | 228 +- + drivers/scsi/lpfc/lpfc_init.c | 22 +- + drivers/scsi/lpfc/lpfc_mbox.c | 152 ++ + drivers/scsi/lpfc/lpfc_nportdisc.c | 8 +- + drivers/scsi/lpfc/lpfc_scsi.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 32 +- + drivers/scsi/lpfc/lpfc_sli4.h | 21 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 9 +- + drivers/scsi/mac53c94.c | 1 - + drivers/scsi/megaraid/megaraid_sas.h | 342 +-- + drivers/scsi/megaraid/megaraid_sas_base.c | 727 +++--- + drivers/scsi/megaraid/megaraid_sas_fp.c | 17 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 554 +++-- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 281 ++- + drivers/scsi/mvsas/mv_init.c | 1 - + drivers/scsi/nsp32.c | 1 - + drivers/scsi/pcmcia/nsp_cs.c | 1 - + drivers/scsi/pcmcia/qlogic_stub.c | 1 - + drivers/scsi/pcmcia/sym53c500_cs.c | 1 - + drivers/scsi/pm8001/pm8001_init.c | 1 - + drivers/scsi/ppa.c | 1 - + drivers/scsi/ps3rom.c | 1 - + drivers/scsi/qla1280.c | 1 - + drivers/scsi/qlogicfas.c | 1 - + drivers/scsi/qlogicpti.c | 1 - + drivers/scsi/scsi.c | 46 - + drivers/scsi/scsi_common.c | 178 ++ + drivers/scsi/scsi_error.c | 64 - + drivers/scsi/scsi_scan.c | 65 +- + drivers/scsi/scsi_transport_iscsi.c | 2 + + drivers/scsi/sd.c | 3 +- + drivers/scsi/st.c | 272 ++- + drivers/scsi/st.h | 22 + + drivers/scsi/sym53c416.c | 1 - + drivers/scsi/ufs/Kconfig | 2 +- + drivers/scsi/ufs/ufs-qcom.c | 39 +- + drivers/scsi/ufs/ufshcd.c | 108 +- + drivers/scsi/ufs/ufshcd.h | 53 +- + drivers/scsi/ufs/ufshci.h | 8 +- + drivers/scsi/virtio_scsi.c | 11 +- + drivers/scsi/wd719x.c | 1 - + drivers/scsi/wd719x.h | 2 - + drivers/staging/rts5208/rtsx.c | 1 - + drivers/target/iscsi/iscsi_target.c | 2 +- + drivers/target/iscsi/iscsi_target_device.c | 1 - + drivers/target/iscsi/iscsi_target_tmr.c | 2 +- + drivers/target/sbp/sbp_target.c | 2 +- + drivers/target/target_core_alua.c | 3 +- + drivers/target/target_core_device.c | 4 +- + drivers/target/target_core_fabric_lib.c | 4 +- + drivers/target/target_core_file.c | 3 +- + drivers/target/target_core_iblock.c | 3 +- + drivers/target/target_core_pr.c | 3 +- + drivers/target/target_core_pscsi.c | 2 - + drivers/target/target_core_pscsi.h | 6 +- + drivers/target/target_core_rd.c | 3 +- + drivers/target/target_core_sbc.c | 2 +- + drivers/target/target_core_spc.c | 3 +- + drivers/target/target_core_stat.c | 3 - + drivers/target/target_core_tmr.c | 2 - + drivers/target/target_core_tpg.c | 3 +- + drivers/target/target_core_transport.c | 4 +- + drivers/target/target_core_ua.c | 3 +- + drivers/target/target_core_user.c | 5 +- + drivers/target/target_core_xcopy.c | 3 +- + drivers/target/tcm_fc/tfc_cmd.c | 4 - + drivers/target/tcm_fc/tfc_conf.c | 4 - + drivers/target/tcm_fc/tfc_io.c | 4 - + drivers/target/tcm_fc/tfc_sess.c | 4 - + drivers/usb/gadget/legacy/tcm_usb_gadget.c | 1 - + drivers/usb/gadget/legacy/tcm_usb_gadget.h | 1 - + drivers/usb/image/microtek.c | 1 - + drivers/usb/storage/scsiglue.c | 1 - + drivers/usb/storage/uas.c | 1 - + drivers/vhost/scsi.c | 3 +- + drivers/xen/xen-scsiback.c | 5 +- + include/linux/libata.h | 2 - + include/scsi/scsi.h | 291 +-- + include/scsi/scsi_common.h | 64 + + include/scsi/scsi_device.h | 2 - + include/scsi/scsi_eh.h | 31 - + include/scsi/scsi_proto.h | 281 +++ + include/target/iscsi/iscsi_target_core.h | 1 - + include/target/target_core_base.h | 15 +- + include/trace/events/target.h | 2 +- + 141 files changed, 6350 insertions(+), 3596 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-scsi_tape + create mode 100644 drivers/scsi/scsi_common.c + create mode 100644 include/scsi/scsi_common.h + create mode 100644 include/scsi/scsi_proto.h +Merging target-updates/for-next (a6fd1b94e964 target: Drop duplicate + unused se_dev_check_wce) +$ git merge target-updates/for-next +Auto-merging include/target/target_core_base.h +Removing include/target/target_core_backend_configfs.h +Auto-merging include/target/iscsi/iscsi_target_core.h +Auto-merging drivers/xen/xen-scsiback.c +Auto-merging drivers/vhost/scsi.c +Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.h +Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c +Auto-merging drivers/target/tcm_fc/tfc_sess.c +Auto-merging drivers/target/tcm_fc/tfc_io.c +Auto-merging drivers/target/tcm_fc/tfc_conf.c +Auto-merging drivers/target/tcm_fc/tfc_cmd.c +Auto-merging drivers/target/target_core_xcopy.c +Auto-merging drivers/target/target_core_user.c +Auto-merging drivers/target/target_core_ua.c +Auto-merging drivers/target/target_core_transport.c +Auto-merging drivers/target/target_core_tpg.c +Auto-merging drivers/target/target_core_tmr.c +Auto-merging drivers/target/target_core_stat.c +Auto-merging drivers/target/target_core_spc.c +Auto-merging drivers/target/target_core_sbc.c +Auto-merging drivers/target/target_core_rd.c +Auto-merging drivers/target/target_core_pscsi.c +Auto-merging drivers/target/target_core_pr.c +Auto-merging drivers/target/target_core_iblock.c +Auto-merging drivers/target/target_core_file.c +Auto-merging drivers/target/target_core_fabric_lib.c +Auto-merging drivers/target/target_core_device.c +Auto-merging drivers/target/target_core_alua.c +Auto-merging drivers/target/sbp/sbp_target.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.h +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Auto-merging drivers/infiniband/ulp/isert/ib_isert.c +Auto-merging Documentation/target/tcm_mod_builder.py +Merge made by the 'recursive' strategy. + Documentation/target/tcm_mod_builder.py | 277 +----- + Documentation/target/tcm_mod_builder.txt | 4 +- + Documentation/target/tcmu-design.txt | 2 +- + drivers/infiniband/ulp/isert/ib_isert.c | 6 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 183 +--- + drivers/infiniband/ulp/srpt/ib_srpt.h | 23 +- + drivers/scsi/qla2xxx/qla_target.c | 52 +- + drivers/scsi/qla2xxx/qla_target.h | 1 - + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 227 +---- + drivers/scsi/qla2xxx/tcm_qla2xxx.h | 6 +- + drivers/target/iscsi/iscsi_target.c | 38 +- + drivers/target/iscsi/iscsi_target_configfs.c | 137 +-- + drivers/target/iscsi/iscsi_target_erl0.c | 53 - + drivers/target/iscsi/iscsi_target_erl0.h | 1 - + drivers/target/iscsi/iscsi_target_login.c | 58 +- + drivers/target/iscsi/iscsi_target_login.h | 1 - + drivers/target/iscsi/iscsi_target_parameters.c | 275 +----- + drivers/target/iscsi/iscsi_target_parameters.h | 11 +- + drivers/target/iscsi/iscsi_target_tpg.c | 12 +- + drivers/target/iscsi/iscsi_target_util.c | 53 +- + drivers/target/iscsi/iscsi_target_util.h | 1 - + drivers/target/loopback/tcm_loop.c | 179 +--- + drivers/target/loopback/tcm_loop.h | 9 - + drivers/target/sbp/sbp_target.c | 275 +----- + drivers/target/sbp/sbp_target.h | 11 +- + drivers/target/target_core_alua.c | 405 +++----- + drivers/target/target_core_alua.h | 14 +- + drivers/target/target_core_configfs.c | 741 ++++++++++++-- + drivers/target/target_core_device.c | 1239 +++++------------------- + drivers/target/target_core_fabric_configfs.c | 205 ++-- + drivers/target/target_core_fabric_lib.c | 283 +++--- + drivers/target/target_core_file.c | 197 +--- + drivers/target/target_core_file.h | 6 - + drivers/target/target_core_hba.c | 97 +- + drivers/target/target_core_iblock.c | 64 +- + drivers/target/target_core_internal.h | 61 +- + drivers/target/target_core_pr.c | 332 ++++--- + drivers/target/target_core_pscsi.c | 53 +- + drivers/target/target_core_rd.c | 88 +- + drivers/target/target_core_sbc.c | 230 ++--- + drivers/target/target_core_spc.c | 90 +- + drivers/target/target_core_stat.c | 608 +++++------- + drivers/target/target_core_tmr.c | 24 +- + drivers/target/target_core_tpg.c | 562 ++++------- + drivers/target/target_core_transport.c | 391 ++++---- + drivers/target/target_core_ua.c | 52 +- + drivers/target/target_core_user.c | 264 ++--- + drivers/target/target_core_xcopy.c | 25 +- + drivers/target/tcm_fc/tcm_fc.h | 3 +- + drivers/target/tcm_fc/tfc_cmd.c | 11 +- + drivers/target/tcm_fc/tfc_conf.c | 112 +-- + drivers/target/tcm_fc/tfc_io.c | 1 - + drivers/target/tcm_fc/tfc_sess.c | 1 - + drivers/usb/gadget/legacy/tcm_usb_gadget.c | 192 +--- + drivers/usb/gadget/legacy/tcm_usb_gadget.h | 11 - + drivers/vhost/scsi.c | 219 +---- + drivers/xen/xen-scsiback.c | 188 +--- + include/linux/crc-t10dif.h | 1 + + include/target/iscsi/iscsi_target_core.h | 12 +- + include/target/target_core_backend.h | 64 +- + include/target/target_core_backend_configfs.h | 118 --- + include/target/target_core_base.h | 166 ++-- + include/target/target_core_configfs.h | 57 +- + include/target/target_core_fabric.h | 62 +- + lib/crc-t10dif.c | 12 +- + 65 files changed, 3063 insertions(+), 6093 deletions(-) + delete mode 100644 include/target/target_core_backend_configfs.h +Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging pinctrl/for-next (323de9efdf3e pinctrl: make pinctrl_register() return proper error code) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/qcom/pinctrl-spmi-mpp.c +Auto-merging drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +Auto-merging drivers/pinctrl/mvebu/pinctrl-armada-370.c +Auto-merging drivers/pinctrl/meson/pinctrl-meson.c +Auto-merging drivers/pinctrl/mediatek/pinctrl-mtk-common.c +Auto-merging drivers/pinctrl/intel/pinctrl-cherryview.c +Auto-merging drivers/pinctrl/core.c +Auto-merging drivers/pinctrl/berlin/berlin.c +Auto-merging drivers/pinctrl/berlin/berlin-bg2q.c +Auto-merging drivers/pinctrl/berlin/berlin-bg2cd.c +Auto-merging drivers/pinctrl/berlin/berlin-bg2.c +Auto-merging drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-atlas7.txt | 50 + + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 2 + + .../bindings/pinctrl/img,pistachio-pinctrl.txt | 217 + + .../pinctrl/marvell,armada-370-pinctrl.txt | 18 +- + .../pinctrl/marvell,armada-375-pinctrl.txt | 34 +- + .../pinctrl/marvell,armada-38x-pinctrl.txt | 66 +- + .../pinctrl/marvell,armada-39x-pinctrl.txt | 84 +- + .../bindings/pinctrl/marvell,armada-xp-pinctrl.txt | 80 +- + .../bindings/pinctrl/nxp,lpc1850-scu.txt | 57 + + .../devicetree/bindings/pinctrl/pinctrl-atlas7.txt | 109 + + .../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 9 +- + .../bindings/pinctrl/qcom,msm8660-pinctrl.txt | 90 + + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 3 +- + .../bindings/pinctrl/xlnx,zynq-pinctrl.txt | 7 +- + Documentation/pinctrl.txt | 11 + + drivers/gpio/gpio-bcm-kona.c | 2 +- + drivers/gpio/gpio-em.c | 2 +- + drivers/gpio/gpio-grgpio.c | 2 +- + drivers/gpio/gpio-mpc8xxx.c | 2 +- + drivers/gpio/gpio-sa1100.c | 2 +- + drivers/gpio/gpio-sodaville.c | 2 +- + drivers/pinctrl/Kconfig | 19 + + drivers/pinctrl/Makefile | 2 + + drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 4 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 4 +- + drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c | 8 +- + drivers/pinctrl/bcm/pinctrl-cygnus-mux.c | 4 +- + drivers/pinctrl/berlin/berlin-bg2.c | 18 +- + drivers/pinctrl/berlin/berlin-bg2cd.c | 8 +- + drivers/pinctrl/berlin/berlin-bg2q.c | 16 +- + drivers/pinctrl/berlin/berlin.c | 4 +- + drivers/pinctrl/core.c | 21 +- + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx.c | 59 +- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx7d.c | 384 ++ + drivers/pinctrl/freescale/pinctrl-mxs.c | 4 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 4 +- + drivers/pinctrl/intel/pinctrl-intel.c | 4 +- + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 263 ++ + drivers/pinctrl/mediatek/Kconfig | 13 + + drivers/pinctrl/mediatek/Makefile | 2 + + drivers/pinctrl/mediatek/pinctrl-mt6397.c | 77 + + drivers/pinctrl/mediatek/pinctrl-mt8127.c | 358 ++ + drivers/pinctrl/mediatek/pinctrl-mt8135.c | 13 +- + drivers/pinctrl/mediatek/pinctrl-mt8173.c | 377 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 161 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 75 +- + drivers/pinctrl/mediatek/pinctrl-mtk-mt6397.h | 424 ++ + drivers/pinctrl/mediatek/pinctrl-mtk-mt8127.h | 1318 ++++++ + drivers/pinctrl/meson/pinctrl-meson.c | 4 +- + drivers/pinctrl/mvebu/pinctrl-armada-370.c | 22 +- + drivers/pinctrl/mvebu/pinctrl-armada-375.c | 50 +- + drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 120 +- + drivers/pinctrl/mvebu/pinctrl-armada-39x.c | 131 +- + drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 98 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 4 +- + drivers/pinctrl/nomadik/pinctrl-ab8505.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 5 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 66 +- + drivers/pinctrl/pinctrl-adi2.c | 5 +- + drivers/pinctrl/pinctrl-amd.c | 5 +- + drivers/pinctrl/pinctrl-as3722.c | 4 +- + drivers/pinctrl/pinctrl-at91.c | 20 +- + drivers/pinctrl/pinctrl-lantiq.c | 4 +- + drivers/pinctrl/pinctrl-lpc18xx.c | 1220 +++++ + drivers/pinctrl/pinctrl-palmas.c | 4 +- + drivers/pinctrl/pinctrl-pistachio.c | 1504 +++++++ + drivers/pinctrl/pinctrl-rockchip.c | 4 +- + drivers/pinctrl/pinctrl-single.c | 6 +- + drivers/pinctrl/pinctrl-st.c | 4 +- + drivers/pinctrl/pinctrl-tb10x.c | 4 +- + drivers/pinctrl/pinctrl-tegra-xusb.c | 27 +- + drivers/pinctrl/pinctrl-tegra.c | 4 +- + drivers/pinctrl/pinctrl-tz1090-pdc.c | 4 +- + drivers/pinctrl/pinctrl-tz1090.c | 4 +- + drivers/pinctrl/pinctrl-u300.c | 4 +- + drivers/pinctrl/pinctrl-zynq.c | 91 +- + drivers/pinctrl/pinmux.c | 59 +- + drivers/pinctrl/qcom/Kconfig | 8 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm.c | 4 +- + drivers/pinctrl/qcom/pinctrl-msm8660.c | 984 +++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 4 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 4 +- + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 4 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 6 +- + drivers/pinctrl/sh-pfc/Kconfig | 5 + + drivers/pinctrl/sh-pfc/Makefile | 1 + + drivers/pinctrl/sh-pfc/core.c | 9 +- + drivers/pinctrl/sh-pfc/core.h | 1 + + drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 4 - + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 101 + + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 186 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 4 +- + drivers/pinctrl/sirf/Makefile | 1 + + drivers/pinctrl/sirf/pinctrl-atlas7.c | 4637 ++++++++++++++++++++ + drivers/pinctrl/sirf/pinctrl-sirf.c | 4 +- + drivers/pinctrl/spear/pinctrl-spear.c | 4 +- + drivers/pinctrl/sunxi/Kconfig | 4 + + drivers/pinctrl/sunxi/Makefile | 1 + + drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c | 513 +++ + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 4 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 4 +- + include/dt-bindings/pinctrl/mt6397-pinfunc.h | 256 ++ + include/linux/pinctrl/consumer.h | 2 +- + include/linux/pinctrl/pinctrl.h | 2 +- + include/linux/pinctrl/pinmux.h | 6 +- + 111 files changed, 13923 insertions(+), 828 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-atlas7.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/nxp,lpc1850-scu.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-atlas7.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.txt + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx7d.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt6397.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8127.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt6397.h + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8127.h + create mode 100644 drivers/pinctrl/pinctrl-lpc18xx.c + create mode 100644 drivers/pinctrl/pinctrl-pistachio.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8660.c + create mode 100644 drivers/pinctrl/sirf/pinctrl-atlas7.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c + create mode 100644 include/dt-bindings/pinctrl/mt6397-pinfunc.h +Merging vhost/linux-next (fa5f6add30c7 tun, macvtap: higher order allocations for skbs) +$ git merge vhost/linux-next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/msi.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/macvtap.c +Auto-merging drivers/net/Kconfig +Merge made by the 'recursive' strategy. + drivers/net/Kconfig | 14 +++++++ + drivers/net/macvtap.c | 67 +++++++++++++++++++++++++++++-- + drivers/net/tun.c | 69 ++++++++++++++++++++++++++++++-- + drivers/pci/msi.c | 4 +- + drivers/pci/pci-driver.c | 2 - + drivers/vhost/Kconfig | 15 +++++++ + drivers/vhost/vhost.c | 85 +++++++++++++++++++++++++++++++++++++++- + drivers/vhost/vhost.h | 25 +++++++++--- + include/linux/pci.h | 4 -- + include/linux/virtio_byteorder.h | 24 +++++++----- + include/linux/virtio_config.h | 18 ++++++--- + include/linux/vringh.h | 18 ++++++--- + include/uapi/linux/if_tun.h | 6 +++ + include/uapi/linux/vhost.h | 14 +++++++ + 14 files changed, 322 insertions(+), 43 deletions(-) +Merging remoteproc/for-next (172e6ab1caff remoteproc: fix various checkpatch warnings) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. + drivers/remoteproc/da8xx_remoteproc.c | 3 +-- + drivers/remoteproc/remoteproc_core.c | 27 +++++++++------------------ + drivers/remoteproc/remoteproc_internal.h | 2 +- + drivers/remoteproc/ste_modem_rproc.c | 4 ++-- + 4 files changed, 13 insertions(+), 23 deletions(-) +Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (2b528fff0905 GPIO / ACPI: export acpi_gpiochip_request(free)_interrupts for module use) +$ git merge gpio/for-next +Auto-merging include/linux/gpio/consumer.h +Auto-merging include/linux/acpi.h +Auto-merging drivers/tty/serial/serial_mctrl_gpio.c +Auto-merging drivers/i2c/i2c-core.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpio-bcm-kona.c +Auto-merging MAINTAINERS +Auto-merging Documentation/gpio/consumer.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/brcm,brcmstb-gpio.txt | 65 +++ + .../devicetree/bindings/gpio/gpio-etraxfs.txt | 21 + + .../devicetree/bindings/gpio/gpio-xlp.txt | 47 ++ + .../devicetree/bindings/gpio/gpio-zynq.txt | 2 +- + .../devicetree/bindings/gpio/nxp,lpc1850-gpio.txt | 39 ++ + Documentation/gpio/consumer.txt | 28 +- + Documentation/gpio/gpio-legacy.txt | 9 - + Documentation/gpio/sysfs.txt | 8 - + Documentation/zh_CN/gpio.txt | 8 - + MAINTAINERS | 7 + + drivers/gpio/Kconfig | 39 +- + drivers/gpio/Makefile | 4 + + drivers/gpio/gpio-bcm-kona.c | 26 +- + drivers/gpio/gpio-brcmstb.c | 252 +++++++++ + drivers/gpio/gpio-crystalcove.c | 2 + + drivers/gpio/gpio-dln2.c | 1 - + drivers/gpio/gpio-etraxfs.c | 176 +++++++ + drivers/gpio/gpio-generic.c | 22 +- + drivers/gpio/gpio-lpc18xx.c | 180 +++++++ + drivers/gpio/gpio-lynxpoint.c | 2 +- + drivers/gpio/gpio-max732x.c | 21 +- + drivers/gpio/gpio-moxart.c | 17 +- + drivers/gpio/gpio-mxc.c | 5 +- + drivers/gpio/gpio-mxs.c | 2 +- + drivers/gpio/gpio-omap.c | 83 ++- + drivers/gpio/gpio-pca953x.c | 23 +- + drivers/gpio/gpio-pcf857x.c | 16 +- + drivers/gpio/gpio-rcar.c | 13 +- + drivers/gpio/gpio-stp-xway.c | 29 +- + drivers/gpio/gpio-tb10x.c | 1 - + drivers/gpio/gpio-tegra.c | 2 +- + drivers/gpio/gpio-ts5500.c | 2 +- + drivers/gpio/gpio-xgene-sb.c | 22 +- + drivers/gpio/gpio-xilinx.c | 4 +- + drivers/gpio/gpio-xlp.c | 427 ++++++++++++++++ + drivers/gpio/gpio-zynq.c | 193 ++++--- + drivers/gpio/gpiolib-acpi.c | 31 ++ + drivers/gpio/gpiolib-of.c | 2 +- + drivers/gpio/gpiolib-sysfs.c | 567 ++++++++++----------- + drivers/gpio/gpiolib.c | 95 ++-- + drivers/gpio/gpiolib.h | 16 +- + drivers/i2c/i2c-core.c | 12 +- + drivers/net/phy/mdio-mux-gpio.c | 3 +- + drivers/tty/serial/serial_mctrl_gpio.c | 2 +- + include/asm-generic/gpio.h | 5 - + include/linux/acpi.h | 7 + + include/linux/basic_mmio_gpio.h | 1 + + include/linux/gpio.h | 7 - + include/linux/gpio/consumer.h | 43 +- + include/linux/gpio/driver.h | 13 +- + include/linux/platform_data/gpio-omap.h | 12 +- + 51 files changed, 1997 insertions(+), 617 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-etraxfs.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-xlp.txt + create mode 100644 Documentation/devicetree/bindings/gpio/nxp,lpc1850-gpio.txt + create mode 100644 drivers/gpio/gpio-brcmstb.c + create mode 100644 drivers/gpio/gpio-etraxfs.c + create mode 100644 drivers/gpio/gpio-lpc18xx.c + create mode 100644 drivers/gpio/gpio-xlp.c +Merging dma-mapping/dma-mapping-next (5ebe6afaf005 Linux 4.1-rc2) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (cccb94543c82 pwm: samsung: Use MODULE_DEVICE_TABLE() to include OF modalias) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + drivers/pwm/core.c | 17 +++++++++++++++++ + drivers/pwm/pwm-samsung.c | 1 + + include/linux/pwm.h | 5 +++++ + 3 files changed, 23 insertions(+) +Merging dma-buf/for-next (5136629dc5a1 dma-buf: Minor coding style fixes) +$ git merge dma-buf/for-next +Merge made by the 'recursive' strategy. + drivers/dma-buf/dma-buf.c | 19 ++++++++++++++++--- + drivers/dma-buf/reservation.c | 9 ++++++--- + drivers/dma-buf/seqno-fence.c | 8 +++++++- + include/linux/dma-buf.h | 10 ++++++++-- + 4 files changed, 37 insertions(+), 9 deletions(-) +Merging userns/for-next (c97648cb2f34 mnt: Update fs_fully_visible to test for permanently empty directories) +$ git merge userns/for-next +Resolved 'drivers/firmware/efi/efi.c' using previous resolution. +Resolved 'fs/libfs.c' using previous resolution. +Resolved 'include/linux/fs.h' using previous resolution. +Auto-merging security/smack/smackfs.c +Auto-merging kernel/cgroup.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging fs/proc/inode.c +Auto-merging fs/namespace.c +Auto-merging fs/libfs.c +CONFLICT (content): Merge conflict in fs/libfs.c +Auto-merging fs/kernfs/dir.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/debugfs/inode.c +Auto-merging fs/configfs/mount.c +Auto-merging drivers/firmware/efi/efi.c +CONFLICT (content): Merge conflict in drivers/firmware/efi/efi.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 451231a0e869] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/s390/hypfs/inode.c | 12 ++---- + drivers/firmware/efi/efi.c | 6 +-- + fs/configfs/mount.c | 10 ++--- + fs/debugfs/inode.c | 11 ++--- + fs/fuse/inode.c | 9 ++--- + fs/kernfs/dir.c | 38 +++++++++++++++++- + fs/kernfs/inode.c | 2 + + fs/libfs.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ + fs/namespace.c | 47 +++++++++++++++++++--- + fs/proc/generic.c | 23 +++++++++++ + fs/proc/inode.c | 4 ++ + fs/proc/internal.h | 6 +++ + fs/proc/proc_sysctl.c | 37 +++++++++++++++++ + fs/proc/root.c | 9 ++--- + fs/pstore/inode.c | 12 ++---- + fs/sysfs/dir.c | 34 ++++++++++++++++ + fs/sysfs/mount.c | 5 +-- + fs/tracefs/inode.c | 6 +-- + include/linux/fs.h | 6 ++- + include/linux/kernfs.h | 3 ++ + include/linux/sysctl.h | 3 ++ + include/linux/sysfs.h | 15 +++++++ + kernel/cgroup.c | 10 ++--- + kernel/sysctl.c | 8 +--- + security/inode.c | 10 ++--- + security/selinux/selinuxfs.c | 11 +++-- + security/smack/smackfs.c | 8 ++-- + 27 files changed, 349 insertions(+), 91 deletions(-) +Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (8c9a8a8f71f4 clk: Move debug_node field under DEBUG_FS flag in struct clk_core) +$ git merge clk/clk-next +Resolved 'drivers/clk/Makefile' using previous resolution. +Auto-merging include/linux/clk-provider.h +Auto-merging drivers/clk/clk.c +Auto-merging drivers/clk/Makefile +CONFLICT (content): Merge conflict in drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master aeefe51c9560] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/clk.txt | 27 +- + .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 23 + + .../bindings/arm/mediatek/mediatek,infracfg.txt | 30 + + .../bindings/arm/mediatek/mediatek,pericfg.txt | 30 + + .../bindings/arm/mediatek/mediatek,topckgen.txt | 23 + + .../bindings/clock/amlogic,meson8b-clkc.txt | 40 + + .../devicetree/bindings/clock/clock-bindings.txt | 7 +- + .../devicetree/bindings/clock/csr,atlas7-car.txt | 55 + + .../devicetree/bindings/clock/emev2-clock.txt | 2 +- + .../devicetree/bindings/clock/marvell,pxa1928.txt | 21 + + .../bindings/clock/mvebu-gated-clock.txt | 1 + + .../devicetree/bindings/clock/ti,cdce925.txt | 42 + + arch/arm/boot/dts/atlas7.dtsi | 15 + + drivers/clk/Kconfig | 20 +- + drivers/clk/Makefile | 4 + + drivers/clk/at91/clk-main.c | 2 +- + drivers/clk/at91/clk-master.c | 2 +- + drivers/clk/at91/clk-programmable.c | 2 +- + drivers/clk/at91/clk-slow.c | 4 +- + drivers/clk/at91/clk-smd.c | 2 +- + drivers/clk/at91/clk-usb.c | 2 +- + drivers/clk/at91/pmc.c | 2 +- + drivers/clk/bcm/clk-kona-setup.c | 4 - + drivers/clk/bcm/clk-kona.c | 2 +- + drivers/clk/bcm/clk-kona.h | 2 - + drivers/clk/berlin/berlin2-pll.c | 9 +- + drivers/clk/clk-asm9260.c | 2 +- + drivers/clk/clk-axm5516.c | 2 +- + drivers/clk/clk-cdce706.c | 5 +- + drivers/clk/clk-cdce925.c | 749 ++++++++ + drivers/clk/clk-composite.c | 6 +- + drivers/clk/clk-conf.c | 7 +- + drivers/clk/clk-divider.c | 6 +- + drivers/clk/clk-fixed-factor.c | 12 +- + drivers/clk/clk-fixed-rate.c | 6 +- + drivers/clk/clk-fractional-divider.c | 4 +- + drivers/clk/clk-gate.c | 6 +- + drivers/clk/clk-gpio-gate.c | 3 +- + drivers/clk/clk-ls1x.c | 6 +- + drivers/clk/clk-max-gen.c | 2 + + drivers/clk/clk-moxart.c | 4 +- + drivers/clk/clk-mux.c | 6 +- + drivers/clk/clk-si5351.c | 26 +- + drivers/clk/clk-u300.c | 1 + + drivers/clk/clk-xgene.c | 22 +- + drivers/clk/clk.c | 1989 ++++++++++---------- + drivers/clk/hisilicon/Kconfig | 6 + + drivers/clk/hisilicon/Makefile | 3 +- + drivers/clk/hisilicon/clk-hi3620.c | 70 +- + drivers/clk/hisilicon/clk-hi6220.c | 284 +++ + drivers/clk/hisilicon/clk-hix5hd2.c | 11 +- + drivers/clk/hisilicon/clk.c | 29 + + drivers/clk/hisilicon/clk.h | 41 +- + drivers/clk/hisilicon/clkdivider-hi6220.c | 156 ++ + drivers/clk/mediatek/Makefile | 4 + + drivers/clk/mediatek/clk-gate.c | 137 ++ + drivers/clk/mediatek/clk-gate.h | 49 + + drivers/clk/mediatek/clk-mt8135.c | 644 +++++++ + drivers/clk/mediatek/clk-mt8173.c | 830 ++++++++ + drivers/clk/mediatek/clk-mtk.c | 220 +++ + drivers/clk/mediatek/clk-mtk.h | 169 ++ + drivers/clk/mediatek/clk-pll.c | 332 ++++ + drivers/clk/mediatek/reset.c | 97 + + drivers/clk/meson/Makefile | 6 + + drivers/clk/meson/clk-cpu.c | 234 +++ + drivers/clk/meson/clk-pll.c | 227 +++ + drivers/clk/meson/clkc.c | 250 +++ + drivers/clk/meson/clkc.h | 187 ++ + drivers/clk/meson/meson8b-clkc.c | 196 ++ + drivers/clk/mmp/Makefile | 2 + + drivers/clk/mmp/clk-apbc.c | 2 +- + drivers/clk/mmp/clk-apmu.c | 2 +- + drivers/clk/mmp/clk-mmp2.c | 4 +- + drivers/clk/mmp/clk-of-mmp2.c | 10 +- + drivers/clk/mmp/clk-of-pxa168.c | 8 + + drivers/clk/mmp/clk-of-pxa1928.c | 265 +++ + drivers/clk/mmp/clk-of-pxa910.c | 12 + + drivers/clk/mvebu/armada-370.c | 1 + + drivers/clk/mxs/clk-imx23.c | 12 +- + drivers/clk/mxs/clk-imx28.c | 18 +- + drivers/clk/mxs/clk.h | 2 +- + drivers/clk/pistachio/clk-pll.c | 115 +- + drivers/clk/pxa/clk-pxa.h | 2 +- + drivers/clk/rockchip/clk-cpu.c | 2 +- + drivers/clk/rockchip/clk-mmc-phase.c | 2 +- + drivers/clk/rockchip/clk-pll.c | 8 +- + drivers/clk/rockchip/clk-rk3188.c | 2 +- + drivers/clk/rockchip/clk-rk3288.c | 2 +- + drivers/clk/rockchip/clk.c | 8 +- + drivers/clk/rockchip/clk.h | 20 +- + drivers/clk/samsung/clk-exynos5260.c | 100 +- + drivers/clk/samsung/clk-exynos5420.c | 10 +- + drivers/clk/samsung/clk-exynos5433.c | 81 +- + drivers/clk/samsung/clk-pll.c | 4 +- + drivers/clk/samsung/clk-s3c2410-dclk.c | 6 +- + drivers/clk/samsung/clk-s5pv210.c | 88 +- + drivers/clk/samsung/clk.c | 15 +- + drivers/clk/samsung/clk.h | 18 +- + drivers/clk/shmobile/clk-emev2.c | 2 +- + drivers/clk/sirf/Makefile | 2 +- + drivers/clk/sirf/clk-atlas7.c | 1632 ++++++++++++++++ + drivers/clk/sirf/clk-common.c | 16 +- + drivers/clk/socfpga/Makefile | 1 + + drivers/clk/socfpga/clk-gate-a10.c | 190 ++ + drivers/clk/socfpga/clk-gate.c | 12 +- + drivers/clk/socfpga/clk-periph-a10.c | 138 ++ + drivers/clk/socfpga/clk-periph.c | 2 +- + drivers/clk/socfpga/clk-pll-a10.c | 129 ++ + drivers/clk/socfpga/clk-pll.c | 7 +- + drivers/clk/socfpga/clk.c | 7 +- + drivers/clk/socfpga/clk.h | 11 +- + drivers/clk/st/clk-flexgen.c | 8 +- + drivers/clk/st/clkgen-fsyn.c | 4 +- + drivers/clk/st/clkgen-mux.c | 16 +- + drivers/clk/st/clkgen-pll.c | 10 +- + drivers/clk/ti/clk-dra7-atl.c | 9 +- + drivers/clk/ti/clk.c | 4 +- + drivers/clk/ti/clockdomain.c | 2 +- + drivers/clk/ti/dpll.c | 2 +- + drivers/clk/ti/fapll.c | 6 +- + drivers/clk/ux500/u8500_clk.c | 7 +- + drivers/clk/ux500/u8500_of_clk.c | 4 +- + drivers/clk/versatile/clk-sp810.c | 4 +- + drivers/clk/zynq/clkc.c | 25 +- + include/dt-bindings/clock/hi6220-clock.h | 173 ++ + include/dt-bindings/clock/marvell,mmp2.h | 1 + + include/dt-bindings/clock/marvell,pxa168.h | 3 + + include/dt-bindings/clock/marvell,pxa1928.h | 57 + + include/dt-bindings/clock/marvell,pxa910.h | 4 + + include/dt-bindings/clock/meson8b-clkc.h | 25 + + include/dt-bindings/clock/mt8135-clk.h | 194 ++ + include/dt-bindings/clock/mt8173-clk.h | 235 +++ + .../dt-bindings/reset-controller/mt8135-resets.h | 64 + + .../dt-bindings/reset-controller/mt8173-resets.h | 63 + + include/linux/clk-provider.h | 14 +- + 135 files changed, 9843 insertions(+), 1480 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,apmixedsys.txt + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.txt + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,topckgen.txt + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt + create mode 100644 Documentation/devicetree/bindings/clock/csr,atlas7-car.txt + create mode 100644 Documentation/devicetree/bindings/clock/marvell,pxa1928.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti,cdce925.txt + create mode 100644 drivers/clk/clk-cdce925.c + create mode 100644 drivers/clk/hisilicon/Kconfig + create mode 100644 drivers/clk/hisilicon/clk-hi6220.c + create mode 100644 drivers/clk/hisilicon/clkdivider-hi6220.c + create mode 100644 drivers/clk/mediatek/Makefile + create mode 100644 drivers/clk/mediatek/clk-gate.c + create mode 100644 drivers/clk/mediatek/clk-gate.h + create mode 100644 drivers/clk/mediatek/clk-mt8135.c + create mode 100644 drivers/clk/mediatek/clk-mt8173.c + create mode 100644 drivers/clk/mediatek/clk-mtk.c + create mode 100644 drivers/clk/mediatek/clk-mtk.h + create mode 100644 drivers/clk/mediatek/clk-pll.c + create mode 100644 drivers/clk/mediatek/reset.c + create mode 100644 drivers/clk/meson/Makefile + create mode 100644 drivers/clk/meson/clk-cpu.c + create mode 100644 drivers/clk/meson/clk-pll.c + create mode 100644 drivers/clk/meson/clkc.c + create mode 100644 drivers/clk/meson/clkc.h + create mode 100644 drivers/clk/meson/meson8b-clkc.c + create mode 100644 drivers/clk/mmp/clk-of-pxa1928.c + create mode 100644 drivers/clk/sirf/clk-atlas7.c + create mode 100644 drivers/clk/socfpga/clk-gate-a10.c + create mode 100644 drivers/clk/socfpga/clk-periph-a10.c + create mode 100644 drivers/clk/socfpga/clk-pll-a10.c + create mode 100644 include/dt-bindings/clock/hi6220-clock.h + create mode 100644 include/dt-bindings/clock/marvell,pxa1928.h + create mode 100644 include/dt-bindings/clock/meson8b-clkc.h + create mode 100644 include/dt-bindings/clock/mt8135-clk.h + create mode 100644 include/dt-bindings/clock/mt8173-clk.h + create mode 100644 include/dt-bindings/reset-controller/mt8135-resets.h + create mode 100644 include/dt-bindings/reset-controller/mt8173-resets.h +Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) +$ git merge random/dev +Already up-to-date. +Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0) +$ git merge aio/master +Already up-to-date. +Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. +Merging kselftest/next (390db010c960 selftest, x86: fix incorrect comment) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 3 +- + tools/testing/selftests/exec/Makefile | 2 +- + tools/testing/selftests/ftrace/Makefile | 1 + + tools/testing/selftests/futex/Makefile | 29 ++ + tools/testing/selftests/futex/README | 62 ++++ + .../testing/selftests/futex/functional/.gitignore | 7 + + tools/testing/selftests/futex/functional/Makefile | 25 ++ + .../selftests/futex/functional/futex_requeue_pi.c | 409 +++++++++++++++++++++ + .../functional/futex_requeue_pi_mismatched_ops.c | 135 +++++++ + .../functional/futex_requeue_pi_signal_restart.c | 223 +++++++++++ + .../functional/futex_wait_private_mapped_file.c | 125 +++++++ + .../futex/functional/futex_wait_timeout.c | 86 +++++ + .../functional/futex_wait_uninitialized_heap.c | 124 +++++++ + .../futex/functional/futex_wait_wouldblock.c | 79 ++++ + tools/testing/selftests/futex/functional/run.sh | 79 ++++ + tools/testing/selftests/futex/include/atomic.h | 83 +++++ + tools/testing/selftests/futex/include/futextest.h | 266 ++++++++++++++ + tools/testing/selftests/futex/include/logging.h | 153 ++++++++ + tools/testing/selftests/futex/run.sh | 33 ++ + tools/testing/selftests/kselftest.h | 17 +- + tools/testing/selftests/lib.mk | 3 + + tools/testing/selftests/mount/Makefile | 7 +- + tools/testing/selftests/timers/.gitignore | 18 + + .../testing/selftests/timers/alarmtimer-suspend.c | 10 +- + tools/testing/selftests/vm/Makefile | 7 +- + tools/testing/selftests/vm/compaction_test.c | 225 ++++++++++++ + tools/testing/selftests/vm/run_vmtests | 12 + + .../testing/selftests/x86/trivial_64bit_program.c | 2 +- + 28 files changed, 2212 insertions(+), 13 deletions(-) + create mode 100644 tools/testing/selftests/futex/Makefile + create mode 100644 tools/testing/selftests/futex/README + create mode 100644 tools/testing/selftests/futex/functional/.gitignore + create mode 100644 tools/testing/selftests/futex/functional/Makefile + create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi.c + create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c + create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c + create mode 100644 tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c + create mode 100644 tools/testing/selftests/futex/functional/futex_wait_timeout.c + create mode 100644 tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c + create mode 100644 tools/testing/selftests/futex/functional/futex_wait_wouldblock.c + create mode 100755 tools/testing/selftests/futex/functional/run.sh + create mode 100644 tools/testing/selftests/futex/include/atomic.h + create mode 100644 tools/testing/selftests/futex/include/futextest.h + create mode 100644 tools/testing/selftests/futex/include/logging.h + create mode 100755 tools/testing/selftests/futex/run.sh + create mode 100644 tools/testing/selftests/timers/.gitignore + create mode 100644 tools/testing/selftests/vm/compaction_test.c +Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump) +$ git merge y2038/y2038 +Resolved 'drivers/staging/media/lirc/lirc_parallel.c' using previous resolution. +Auto-merging kernel/cpuset.c +Auto-merging fs/coredump.c +Auto-merging drivers/staging/media/lirc/lirc_serial.c +Auto-merging drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/staging/media/lirc/lirc_parallel.c +CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c +Auto-merging drivers/staging/gdm72xx/gdm_sdio.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f5ba918883f1] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 4 +- + drivers/staging/ft1000/ft1000.h | 4 +- + drivers/staging/gdm72xx/gdm_sdio.c | 13 +++--- + drivers/staging/gdm72xx/gdm_sdio.h | 4 +- + drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++---------- + drivers/staging/media/lirc/lirc_sasem.c | 20 +++++----- + drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++---------------- + fs/coredump.c | 8 ++-- + kernel/cpuset.c | 12 ++++-- + 11 files changed, 68 insertions(+), 90 deletions(-) +Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux) +$ git merge luto-misc/next +Already up-to-date. +Merging access_once/linux-next (bc465aa9d045 Linux 4.0-rc5) +$ git merge access_once/linux-next +Already up-to-date. +Merging livepatching/for-next (507a76d5f701 Merge branch 'for-4.1/upstream-fixes' into for-next) +$ git merge livepatching/for-next +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +Merge made by the 'recursive' strategy. + arch/x86/include/asm/livepatch.h | 1 + + arch/x86/include/asm/setup.h | 7 +++ + arch/x86/kernel/machine_kexec_64.c | 3 +- + arch/x86/kernel/setup.c | 2 +- + include/linux/livepatch.h | 8 +++- + kernel/livepatch/core.c | 96 ++++++++++++++++++++++++-------------- + 6 files changed, 79 insertions(+), 38 deletions(-) +Merging coresight/next (486ea46dfc88 coresight-etm3x: Add Qualcomm PTM v1.1 peripheral ID) +$ git merge coresight/next +Resolved 'drivers/hwtracing/coresight/coresight-etm3x.c' using previous resolution. +Auto-merging drivers/hwtracing/coresight/coresight-etm3x.c +CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-etm3x.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 65f19dfcf44c] Merge remote-tracking branch 'coresight/next' +$ git diff -M --stat --summary HEAD^.. + drivers/hwtracing/coresight/coresight-etm3x.c | 5 +++++ + 1 file changed, 5 insertions(+) +Merging rtc/rtc-next (ce7ffc74836c rtc: palmas: Initialise bb_charging flag before using it) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/Makefile +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/mfd/mt6397-core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 + + drivers/mfd/mt6397-core.c | 18 ++ + drivers/rtc/Kconfig | 23 ++ + drivers/rtc/Makefile | 2 + + drivers/rtc/interface.c | 4 +- + drivers/rtc/rtc-ab8500.c | 2 +- + drivers/rtc/rtc-at32ap700x.c | 2 +- + drivers/rtc/rtc-ds1216.c | 4 +- + drivers/rtc/rtc-ds1286.c | 4 +- + drivers/rtc/rtc-ds1672.c | 1 + + drivers/rtc/rtc-efi.c | 4 +- + drivers/rtc/rtc-ep93xx.c | 6 +- + drivers/rtc/rtc-gemini.c | 177 +++++++++++++++ + drivers/rtc/rtc-hid-sensor-time.c | 2 +- + drivers/rtc/rtc-imxdi.c | 438 +++++++++++++++++++++++++++++++++----- + drivers/rtc/rtc-max6900.c | 1 + + drivers/rtc/rtc-max77686.c | 1 + + drivers/rtc/rtc-max77802.c | 1 + + drivers/rtc/rtc-max8998.c | 1 + + drivers/rtc/rtc-mc13xxx.c | 2 +- + drivers/rtc/rtc-mt6397.c | 395 ++++++++++++++++++++++++++++++++++ + drivers/rtc/rtc-mxc.c | 2 +- + drivers/rtc/rtc-palmas.c | 2 +- + drivers/rtc/rtc-pcf8563.c | 11 +- + drivers/rtc/rtc-s3c.c | 14 +- + drivers/rtc/rtc-snvs.c | 30 ++- + drivers/rtc/rtc-spear.c | 7 +- + drivers/rtc/rtc-v3020.c | 41 +--- + include/linux/rtc.h | 11 +- + 29 files changed, 1064 insertions(+), 150 deletions(-) + create mode 100644 drivers/rtc/rtc-gemini.c + create mode 100644 drivers/rtc/rtc-mt6397.c +Merging init/init-v4.1-rc6 (154df8aa7057 module: relocate module_init from init.h to module.h) +$ git merge init/init-v4.1-rc6 +Resolved 'arch/arm/mach-keystone/platsmp.c' using previous resolution. +Auto-merging include/linux/module.h +Auto-merging include/linux/device.h +Auto-merging drivers/soc/tegra/pmc.c +Auto-merging arch/x86/kernel/devicetree.c +Auto-merging arch/x86/kernel/cpu/perf_event_intel_pt.c +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/arm/mach-rockchip/platsmp.c +Auto-merging arch/arm/mach-mvebu/headsmp-a9.S +Auto-merging arch/arm/mach-keystone/platsmp.c +CONFLICT (content): Merge conflict in arch/arm/mach-keystone/platsmp.c +CONFLICT (modify/delete): arch/arm/mach-hisi/headsmp.S deleted in HEAD and modified in init/init-v4.1-rc6. Version init/init-v4.1-rc6 of arch/arm/mach-hisi/headsmp.S left in tree. +Auto-merging arch/arm/kernel/entry-armv.S +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-hisi/headsmp.S +arch/arm/mach-hisi/headsmp.S: needs merge +rm 'arch/arm/mach-hisi/headsmp.S' +$ git commit -v -a +[master 76d163452093] Merge remote-tracking branch 'init/init-v4.1-rc6' +$ git diff -M --stat --summary HEAD^.. + arch/arm/kernel/entry-armv.S | 2 + + arch/arm/mach-mvebu/headsmp-a9.S | 3 - + arch/arm/mach-mvebu/platsmp-a9.c | 2 +- + arch/arm/mach-rockchip/platsmp.c | 3 +- + arch/arm/mach-vexpress/spc.c | 2 +- + arch/cris/arch-v32/mm/intmem.c | 3 +- + arch/frv/mb93090-mb00/flash.c | 2 +- + arch/ia64/hp/sim/simscsi.c | 11 +--- + arch/ia64/sn/kernel/mca.c | 3 +- + arch/mn10300/unit-asb2303/flash.c | 3 +- + arch/parisc/kernel/pdc_cons.c | 3 +- + arch/parisc/kernel/perf.c | 3 +- + arch/powerpc/kernel/time.c | 2 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/platforms/83xx/suspend.c | 3 +- + arch/powerpc/platforms/ps3/time.c | 3 +- + arch/powerpc/sysdev/fsl_lbc.c | 2 +- + arch/sh/boards/mach-highlander/psw.c | 2 +- + arch/sh/boards/mach-landisk/psw.c | 2 +- + arch/tile/kernel/usb.c | 1 + + arch/x86/kernel/bootflag.c | 2 +- + arch/x86/kernel/cpu/perf_event_intel_bts.c | 3 +- + arch/x86/kernel/cpu/perf_event_intel_pt.c | 3 +- + arch/x86/kernel/devicetree.c | 2 +- + arch/x86/kernel/vsmp_64.c | 2 +- + arch/x86/platform/intel-mid/intel_mid_vrtc.c | 3 +- + arch/xtensa/platforms/iss/network.c | 4 +- + crypto/asymmetric_keys/pkcs7_key_type.c | 1 + + drivers/clk/clk-max77686.c | 1 + + drivers/clk/clk-max77802.c | 1 + + drivers/clk/clk-nomadik.c | 3 +- + drivers/clk/sunxi/clk-mod0.c | 2 +- + drivers/cpufreq/exynos-cpufreq.c | 1 + + drivers/cpufreq/s5pv210-cpufreq.c | 2 +- + drivers/cpuidle/cpuidle-at91.c | 3 +- + drivers/cpuidle/cpuidle-calxeda.c | 3 +- + drivers/cpuidle/cpuidle-zynq.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 + + drivers/hsi/controllers/omap_ssi.h | 1 + + drivers/mailbox/pl320-ipc.c | 2 +- + drivers/pcmcia/xxs1500_ss.c | 1 + + drivers/platform/goldfish/pdev_bus.c | 12 +--- + drivers/power/reset/syscon-reboot.c | 2 +- + drivers/regulator/max77802.c | 1 + + drivers/soc/tegra/pmc.c | 2 +- + drivers/soc/versatile/soc-realview.c | 2 +- + drivers/tty/metag_da.c | 20 +------ + fs/notify/inotify/inotify_user.c | 4 +- + include/linux/device.h | 22 +++++++ + include/linux/init.h | 89 ---------------------------- + include/linux/module.h | 84 ++++++++++++++++++++++++++ + include/linux/platform_device.h | 23 +++++++ + lib/list_sort.c | 2 +- + mm/nommu.c | 4 +- + mm/page_owner.c | 2 +- + net/ipv4/netfilter.c | 9 +-- + scripts/tags.sh | 2 +- + 58 files changed, 185 insertions(+), 197 deletions(-) +$ git am -3 ../patches/drivers_hwtracing__fix_coresight-replicator-qcom_implicit__module.h__usage.patch +Applying: drivers/hwtracing: fix coresight-replicator-qcom implicit <module.h> usage +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/hwtracing/coresight/coresight-replicator-qcom.c +$ git add -A . +$ git commit -v -a --amend +[master 441b41c3d2f4] Merge remote-tracking branch 'init/init-v4.1-rc6' + Date: Thu Jun 11 19:14:27 2015 +1000 +$ git am -3 ../patches/drivers_hwtracing__fix_coresight-etm4x_implicit__module.h__usage.patch +Applying: drivers/hwtracing: fix coresight-etm4x implicit <module.h> usage +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/hwtracing/coresight/coresight-etm4x.c +$ git add -A . +$ git commit -v -a --amend +[master 91b6bd295511] Merge remote-tracking branch 'init/init-v4.1-rc6' + Date: Thu Jun 11 19:14:27 2015 +1000 +Merging akpm-current/current (4ace53bb3d31 scsi-resolve-sg-buffer-const-ness-issue-fix) +$ git merge --no-ff akpm-current/current +Resolved 'arch/x86/Kconfig' using previous resolution. +Resolved 'arch/x86/kernel/machine_kexec_64.c' using previous resolution. +Resolved 'drivers/staging/android/lowmemorykiller.c' using previous resolution. +Auto-merging mm/vmscan.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/nommu.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging mm/madvise.c +Auto-merging mm/filemap.c +Auto-merging lib/scatterlist.c +Auto-merging lib/radix-tree.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging kernel/trace/trace_events_filter.c +Auto-merging kernel/trace/blktrace.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/sys.c +Auto-merging kernel/sched/wait.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/fork.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/Kbuild +Auto-merging include/linux/wait.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/swap.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/scatterlist.h +Auto-merging include/linux/rtc.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/gfp.h +Auto-merging include/linux/efi.h +Removing include/linux/compiler-gcc5.h +Removing include/linux/compiler-gcc4.h +Removing include/linux/compiler-gcc3.h +Auto-merging include/asm-generic/pgtable.h +Auto-merging fs/ufs/super.c +Auto-merging fs/ufs/namei.c +Auto-merging fs/ufs/inode.c +Auto-merging fs/splice.c +Auto-merging fs/reiserfs/super.c +Auto-merging fs/proc/base.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/namespace.c +Auto-merging fs/mpage.c +Auto-merging fs/mount.h +Auto-merging fs/jbd2/journal.c +Auto-merging fs/fat/inode.c +Auto-merging fs/fat/file.c +Auto-merging fs/ext4/super.c +Auto-merging fs/coredump.c +Auto-merging fs/Makefile +Auto-merging drivers/tty/sysrq.c +Auto-merging drivers/staging/android/lowmemorykiller.c +CONFLICT (content): Merge conflict in drivers/staging/android/lowmemorykiller.c +Auto-merging drivers/rtc/interface.c +Auto-merging drivers/pci/host/pcie-spear13xx.c +Auto-merging drivers/md/md.c +Auto-merging block/genhd.c +Auto-merging arch/x86/platform/efi/efi.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +CONFLICT (content): Merge conflict in arch/x86/kernel/machine_kexec_64.c +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging arch/sparc/mm/init_64.c +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/s390/kernel/crash_dump.c +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/powerpc/include/asm/systbl.h +Auto-merging arch/powerpc/include/asm/pgtable-ppc64.h +Auto-merging arch/arc/include/asm/dma-mapping.h +Auto-merging MAINTAINERS +Auto-merging Documentation/ioctl/ioctl-number.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5739d79a2c9f] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 2 + + .../ABI/testing/configfs-spear-pcie-gadget | 2 +- + Documentation/ABI/testing/dev-kmsg | 9 + + Documentation/ABI/testing/sysfs-bus-usb-lvstest | 12 +- + Documentation/ABI/testing/sysfs-class-zram | 24 + + Documentation/blockdev/zram.txt | 29 +- + Documentation/devicetree/bindings/w1/omap-hdq.txt | 7 +- + Documentation/filesystems/vfat.txt | 10 + + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/lockup-watchdogs.txt | 18 + + Documentation/misc-devices/spear-pcie-gadget.txt | 2 +- + Documentation/networking/netconsole.txt | 35 +- + Documentation/printk-formats.txt | 8 + + Documentation/sysctl/kernel.txt | 25 +- + Documentation/vm/unevictable-lru.txt | 8 +- + Documentation/vm/userfaultfd.txt | 144 +++ + Documentation/vm/zswap.txt | 18 +- + Documentation/w1/masters/omap-hdq | 6 + + MAINTAINERS | 6 +- + arch/Kconfig | 7 + + arch/alpha/include/asm/mm-arch-hooks.h | 15 + + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/arc/include/asm/dma-mapping.h | 12 +- + arch/arc/include/asm/mm-arch-hooks.h | 15 + + arch/arm/include/asm/hugetlb.h | 13 - + arch/arm/include/asm/mm-arch-hooks.h | 15 + + arch/arm/include/asm/pgtable-3level.h | 1 + + arch/arm/mm/hugetlbpage.c | 5 - + arch/arm64/include/asm/hugetlb.h | 13 - + arch/arm64/include/asm/mm-arch-hooks.h | 15 + + arch/arm64/include/asm/pgtable.h | 2 + + arch/arm64/mm/hugetlbpage.c | 7 - + arch/avr32/include/asm/dma-mapping.h | 19 +- + arch/avr32/include/asm/mm-arch-hooks.h | 15 + + arch/blackfin/include/asm/mm-arch-hooks.h | 15 + + arch/c6x/include/asm/mm-arch-hooks.h | 15 + + arch/cris/include/asm/mm-arch-hooks.h | 15 + + arch/frv/include/asm/mm-arch-hooks.h | 15 + + arch/frv/include/asm/sections.h | 6 - + arch/frv/mb93090-mb00/pci-dma-nommu.c | 10 +- + arch/frv/mb93090-mb00/pci-dma.c | 7 +- + arch/hexagon/include/asm/mm-arch-hooks.h | 15 + + arch/ia64/include/asm/hugetlb.h | 13 - + arch/ia64/include/asm/mm-arch-hooks.h | 15 + + arch/ia64/mm/hugetlbpage.c | 5 - + arch/ia64/mm/numa.c | 19 +- + arch/m32r/include/asm/mm-arch-hooks.h | 15 + + arch/m68k/include/asm/mm-arch-hooks.h | 15 + + arch/metag/include/asm/hugetlb.h | 13 - + arch/metag/include/asm/mm-arch-hooks.h | 15 + + arch/metag/mm/hugetlbpage.c | 5 - + arch/microblaze/include/asm/mm-arch-hooks.h | 15 + + arch/mips/include/asm/hugetlb.h | 13 - + arch/mips/include/asm/mm-arch-hooks.h | 15 + + arch/mips/include/asm/pgtable.h | 8 +- + arch/mips/include/uapi/asm/mman.h | 1 + + arch/mips/mm/hugetlbpage.c | 5 - + arch/mn10300/include/asm/mm-arch-hooks.h | 15 + + arch/nios2/include/asm/mm-arch-hooks.h | 15 + + arch/openrisc/include/asm/mm-arch-hooks.h | 15 + + arch/parisc/include/asm/mm-arch-hooks.h | 15 + + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/parisc/kernel/pci-dma.c | 27 +- + arch/powerpc/include/asm/hugetlb.h | 14 - + arch/powerpc/include/asm/mm-arch-hooks.h | 28 + + arch/powerpc/include/asm/mmu_context.h | 23 +- + arch/powerpc/include/asm/pgtable-ppc64.h | 16 +- + 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/vio.c | 10 +- + arch/powerpc/mm/hugetlbpage.c | 5 - + arch/powerpc/mm/pgtable_64.c | 73 +- + arch/s390/include/asm/hugetlb.h | 4 - + arch/s390/include/asm/mm-arch-hooks.h | 15 + + arch/s390/include/asm/page.h | 8 +- + arch/s390/include/asm/pgtable.h | 30 +- + arch/s390/kernel/compat_wrapper.c | 2 +- + arch/s390/kernel/crash_dump.c | 5 +- + arch/s390/kernel/setup.c | 2 + + arch/s390/mm/hugetlbpage.c | 70 +- + arch/s390/mm/pgtable.c | 2 + + arch/score/include/asm/mm-arch-hooks.h | 15 + + arch/sh/include/asm/hugetlb.h | 12 - + arch/sh/include/asm/mm-arch-hooks.h | 15 + + arch/sh/mm/hugetlbpage.c | 5 - + arch/sparc/include/asm/hugetlb.h | 13 - + arch/sparc/include/asm/mm-arch-hooks.h | 15 + + arch/sparc/include/asm/pgtable_64.h | 17 +- + arch/sparc/kernel/ldc.c | 8 +- + arch/sparc/mm/hugetlbpage.c | 5 - + arch/sparc/mm/init_64.c | 6 +- + arch/tile/include/asm/hugetlb.h | 13 - + arch/tile/include/asm/mm-arch-hooks.h | 15 + + arch/tile/include/asm/pgtable.h | 8 +- + arch/tile/mm/hugetlbpage.c | 5 - + arch/um/include/asm/mm-arch-hooks.h | 15 + + arch/unicore32/include/asm/mm-arch-hooks.h | 15 + + arch/x86/Kconfig | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/hugetlb.h | 12 - + arch/x86/include/asm/mm-arch-hooks.h | 15 + + arch/x86/include/asm/pgtable.h | 9 +- + arch/x86/kernel/check.c | 3 +- + arch/x86/kernel/e820.c | 3 +- + arch/x86/kernel/kexec-bzimage64.c | 11 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/setup.c | 3 + + arch/x86/mm/init_32.c | 2 +- + arch/x86/platform/efi/efi.c | 21 + + arch/xtensa/include/asm/dma-mapping.h | 19 +- + arch/xtensa/include/asm/mm-arch-hooks.h | 15 + + arch/xtensa/include/uapi/asm/mman.h | 1 + + block/genhd.c | 2 +- + drivers/base/core.c | 9 +- + drivers/base/node.c | 6 +- + drivers/block/zram/Kconfig | 10 +- + drivers/block/zram/zcomp.c | 7 +- + drivers/block/zram/zcomp.h | 1 + + drivers/block/zram/zram_drv.c | 1031 +++++++++------- + drivers/block/zram/zram_drv.h | 10 +- + drivers/md/md.c | 4 +- + drivers/memstick/host/jmb38x_ms.c | 12 +- + drivers/memstick/host/r592.c | 10 +- + drivers/misc/kgdbts.c | 2 +- + drivers/misc/spear13xx_pcie_gadget.c | 2 +- + drivers/net/netconsole.c | 169 ++- + drivers/pci/host/pcie-spear13xx.c | 6 +- + drivers/phy/phy-spear1310-miphy.c | 6 +- + drivers/phy/phy-spear1340-miphy.c | 6 +- + drivers/rtc/class.c | 24 + + drivers/rtc/interface.c | 13 +- + drivers/rtc/rtc-ds1307.c | 12 +- + drivers/rtc/rtc-omap.c | 14 +- + drivers/scsi/scsi_debug.c | 12 +- + drivers/staging/android/lowmemorykiller.c | 2 +- + drivers/tty/sysrq.c | 2 + + drivers/usb/misc/lvstest.c | 2 +- + drivers/w1/masters/omap_hdq.c | 224 +++- + drivers/xen/tmem.c | 8 +- + fs/Makefile | 1 + + fs/adfs/super.c | 2 +- + fs/affs/amigaffs.c | 2 +- + fs/affs/inode.c | 2 +- + fs/affs/symlink.c | 4 +- + fs/befs/btree.c | 6 +- + fs/cifs/file.c | 8 +- + fs/configfs/item.c | 3 +- + fs/coredump.c | 19 +- + fs/devpts/inode.c | 31 +- + fs/efs/super.c | 2 +- + fs/ext4/fsync.c | 5 +- + fs/ext4/super.c | 4 +- + fs/fat/cache.c | 79 +- + fs/fat/dir.c | 2 +- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 61 + + fs/fat/inode.c | 75 +- + fs/hugetlbfs/inode.c | 1 - + fs/jbd2/journal.c | 10 +- + fs/minix/inode.c | 2 +- + fs/mount.h | 3 - + fs/mpage.c | 23 +- + fs/namespace.c | 6 +- + fs/nilfs2/namei.c | 5 +- + fs/ntfs/file.c | 3 +- + fs/ntfs/malloc.h | 7 +- + fs/ocfs2/acl.c | 26 +- + fs/ocfs2/alloc.c | 282 +++-- + fs/ocfs2/aops.c | 61 +- + fs/ocfs2/aops.h | 7 - + fs/ocfs2/buffer_head_io.c | 6 + + fs/ocfs2/cluster/heartbeat.c | 49 +- + fs/ocfs2/cluster/masklog.c | 34 + + fs/ocfs2/cluster/masklog.h | 42 +- + fs/ocfs2/cluster/tcp.c | 2 +- + fs/ocfs2/dir.c | 90 +- + fs/ocfs2/dlm/dlmcommon.h | 1 - + fs/ocfs2/dlm/dlmmaster.c | 22 +- + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/ocfs2/dlmglue.c | 10 +- + fs/ocfs2/extent_map.c | 22 +- + fs/ocfs2/file.c | 40 +- + fs/ocfs2/inode.c | 49 +- + fs/ocfs2/journal.c | 68 +- + fs/ocfs2/localalloc.c | 3 +- + fs/ocfs2/move_extents.c | 8 +- + fs/ocfs2/namei.c | 46 +- + fs/ocfs2/namei.h | 4 +- + fs/ocfs2/ocfs2.h | 12 + + fs/ocfs2/quota_local.c | 3 +- + fs/ocfs2/refcounttree.c | 81 +- + fs/ocfs2/suballoc.c | 90 +- + fs/ocfs2/super.c | 67 +- + fs/ocfs2/super.h | 8 +- + fs/ocfs2/xattr.c | 51 +- + fs/posix_acl.c | 46 +- + fs/proc/Kconfig | 4 + + fs/proc/array.c | 12 +- + fs/proc/base.c | 207 +++- + fs/proc/task_mmu.c | 2 + + fs/proc_namespace.c | 34 +- + fs/reiserfs/super.c | 3 +- + fs/seq_file.c | 19 +- + fs/splice.c | 2 +- + fs/ufs/balloc.c | 34 +- + fs/ufs/ialloc.c | 16 +- + fs/ufs/inode.c | 5 +- + fs/ufs/namei.c | 14 +- + fs/ufs/super.c | 9 + + fs/ufs/ufs.h | 1 + + fs/userfaultfd.c | 1277 ++++++++++++++++++++ + include/asm-generic/pgtable.h | 34 +- + include/linux/bootmem.h | 8 +- + include/linux/compiler-gcc.h | 207 +++- + include/linux/compiler-gcc3.h | 23 - + include/linux/compiler-gcc4.h | 91 -- + include/linux/compiler-gcc5.h | 67 - + include/linux/compiler-intel.h | 2 + + include/linux/configfs.h | 1 - + include/linux/console.h | 1 + + include/linux/crc64_ecma.h | 56 + + include/linux/efi.h | 3 + + include/linux/frontswap.h | 14 +- + include/linux/fsnotify_backend.h | 2 - + include/linux/gfp.h | 8 + + include/linux/huge_mm.h | 4 + + include/linux/kernel.h | 3 + + include/linux/kexec.h | 2 + + include/linux/memblock.h | 67 +- + include/linux/mm-arch-hooks.h | 25 + + include/linux/mm.h | 89 +- + include/linux/mm_types.h | 11 + + include/linux/mmu_notifier.h | 12 +- + include/linux/mmzone.h | 23 +- + include/linux/nmi.h | 3 + + include/linux/oom.h | 12 +- + include/linux/page-flags.h | 237 ++-- + include/linux/pagemap.h | 25 +- + include/linux/poison.h | 4 + + include/linux/printk.h | 2 + + include/linux/rmap.h | 9 +- + include/linux/rtc.h | 4 + + include/linux/scatterlist.h | 7 +- + include/linux/sched.h | 15 + + include/linux/slab.h | 36 +- + include/linux/smpboot.h | 5 + + include/linux/string.h | 2 + + include/linux/swap.h | 1 + + include/linux/syscalls.h | 7 +- + include/linux/syslog.h | 6 +- + include/linux/userfaultfd_k.h | 85 ++ + include/linux/vm_event_item.h | 1 + + include/linux/wait.h | 5 +- + include/linux/zpool.h | 5 +- + include/ras/ras_event.h | 85 ++ + include/uapi/asm-generic/mman-common.h | 1 + + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/userfaultfd.h | 169 +++ + init/Kconfig | 12 + + init/do_mounts.c | 9 +- + init/main.c | 2 + + ipc/msg.c | 55 +- + ipc/sem.c | 4 +- + ipc/shm.c | 12 +- + ipc/util.c | 28 +- + ipc/util.h | 2 +- + kernel/exit.c | 4 +- + kernel/fork.c | 51 +- + kernel/gcov/base.c | 6 + + kernel/gcov/gcc_4_7.c | 4 +- + kernel/kexec.c | 11 + + kernel/panic.c | 5 +- + kernel/printk/printk.c | 235 ++-- + kernel/sched/fair.c | 2 +- + kernel/sched/wait.c | 7 +- + kernel/smpboot.c | 60 +- + kernel/sys.c | 158 ++- + kernel/sys_ni.c | 1 + + kernel/sysctl.c | 7 + + kernel/trace/blktrace.c | 6 +- + kernel/trace/trace_events_filter.c | 5 +- + kernel/watchdog.c | 67 +- + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/bitmap.c | 32 +- + lib/crc64_ecma.c | 341 ++++++ + lib/kobject.c | 13 +- + lib/radix-tree.c | 28 +- + lib/scatterlist.c | 18 +- + lib/sort.c | 23 +- + lib/string.c | 17 + + lib/test-hexdump.c | 6 +- + lib/vsprintf.c | 20 +- + mm/Kconfig | 19 + + mm/Makefile | 1 + + mm/bootmem.c | 13 +- + mm/cma.c | 10 +- + mm/compaction.c | 32 +- + mm/filemap.c | 38 +- + mm/frontswap.c | 215 ++-- + mm/huge_memory.c | 134 +- + mm/hugetlb.c | 197 ++- + mm/hwpoison-inject.c | 4 +- + mm/internal.h | 11 +- + mm/kasan/kasan.h | 1 - + mm/kmemleak.c | 159 ++- + mm/ksm.c | 2 +- + mm/madvise.c | 179 ++- + mm/memblock.c | 157 ++- + mm/memcontrol.c | 65 +- + mm/memory-failure.c | 353 +++--- + mm/memory.c | 28 +- + mm/memory_hotplug.c | 15 +- + mm/mempolicy.c | 4 +- + mm/memtest.c | 3 +- + mm/migrate.c | 13 +- + mm/mlock.c | 3 +- + mm/mm_init.c | 9 +- + mm/mmap.c | 46 +- + mm/mprotect.c | 14 +- + mm/mremap.c | 17 +- + mm/nobootmem.c | 21 +- + mm/nommu.c | 112 +- + mm/oom_kill.c | 158 +-- + mm/page_alloc.c | 626 +++++++--- + mm/page_isolation.c | 7 +- + mm/pgtable-generic.c | 29 +- + mm/rmap.c | 55 +- + mm/shmem.c | 4 +- + mm/slab.c | 14 + + mm/slab.h | 10 + + mm/slab_common.c | 121 +- + mm/slob.c | 13 + + mm/slub.c | 69 ++ + mm/swap.c | 45 +- + mm/swap_state.c | 4 +- + mm/userfaultfd.c | 308 +++++ + mm/util.c | 40 +- + mm/vmscan.c | 132 +- + mm/vmstat.c | 1 + + mm/zbud.c | 23 +- + mm/zpool.c | 35 +- + mm/zsmalloc.c | 10 +- + mm/zswap.c | 16 +- + net/sunrpc/sched.c | 2 +- + scripts/checkpatch.pl | 244 +++- + scripts/gdb/linux/dmesg.py | 1 - + scripts/gdb/linux/lists.py | 92 ++ + scripts/gdb/linux/symbols.py | 9 +- + scripts/gdb/linux/tasks.py | 20 +- + scripts/gdb/linux/utils.py | 4 +- + scripts/gdb/vmlinux-gdb.py | 1 + + scripts/get_maintainer.pl | 32 + + 355 files changed, 9427 insertions(+), 3659 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-zram + create mode 100644 Documentation/vm/userfaultfd.txt + create mode 100644 arch/alpha/include/asm/mm-arch-hooks.h + create mode 100644 arch/arc/include/asm/mm-arch-hooks.h + create mode 100644 arch/arm/include/asm/mm-arch-hooks.h + create mode 100644 arch/arm64/include/asm/mm-arch-hooks.h + create mode 100644 arch/avr32/include/asm/mm-arch-hooks.h + create mode 100644 arch/blackfin/include/asm/mm-arch-hooks.h + create mode 100644 arch/c6x/include/asm/mm-arch-hooks.h + create mode 100644 arch/cris/include/asm/mm-arch-hooks.h + create mode 100644 arch/frv/include/asm/mm-arch-hooks.h + create mode 100644 arch/hexagon/include/asm/mm-arch-hooks.h + create mode 100644 arch/ia64/include/asm/mm-arch-hooks.h + create mode 100644 arch/m32r/include/asm/mm-arch-hooks.h + create mode 100644 arch/m68k/include/asm/mm-arch-hooks.h + create mode 100644 arch/metag/include/asm/mm-arch-hooks.h + create mode 100644 arch/microblaze/include/asm/mm-arch-hooks.h + create mode 100644 arch/mips/include/asm/mm-arch-hooks.h + create mode 100644 arch/mn10300/include/asm/mm-arch-hooks.h + create mode 100644 arch/nios2/include/asm/mm-arch-hooks.h + create mode 100644 arch/openrisc/include/asm/mm-arch-hooks.h + create mode 100644 arch/parisc/include/asm/mm-arch-hooks.h + create mode 100644 arch/powerpc/include/asm/mm-arch-hooks.h + create mode 100644 arch/s390/include/asm/mm-arch-hooks.h + create mode 100644 arch/score/include/asm/mm-arch-hooks.h + create mode 100644 arch/sh/include/asm/mm-arch-hooks.h + create mode 100644 arch/sparc/include/asm/mm-arch-hooks.h + create mode 100644 arch/tile/include/asm/mm-arch-hooks.h + create mode 100644 arch/um/include/asm/mm-arch-hooks.h + create mode 100644 arch/unicore32/include/asm/mm-arch-hooks.h + create mode 100644 arch/x86/include/asm/mm-arch-hooks.h + create mode 100644 arch/xtensa/include/asm/mm-arch-hooks.h + create mode 100644 fs/userfaultfd.c + delete mode 100644 include/linux/compiler-gcc3.h + delete mode 100644 include/linux/compiler-gcc4.h + delete mode 100644 include/linux/compiler-gcc5.h + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/linux/mm-arch-hooks.h + create mode 100644 include/linux/userfaultfd_k.h + create mode 100644 include/uapi/linux/userfaultfd.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 mm/userfaultfd.c + create mode 100644 scripts/gdb/linux/lists.py +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/block/nvme-core.c: fix build with gcc-4.4.4 +Applying: drivers/gpu/drm/i915/intel_sprite.c: fix build +Applying: drivers/gpu/drm/i915/intel_tv.c: fix build +Applying: arch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR +Applying: printk: improve the description of /dev/kmsg line format +Applying: kernel/relay.c: use kvfree() in relay_free_page_array() +Applying: cxgb3: use kvfree() in cxgb_free_mem() +Applying: cxgb4: use kvfree() in t4_free_mem() +Applying: drm: use kvfree() in drm_free_large() +Applying: drm/nouveau/gem: use kvfree() in u_free() +Applying: IB/ehca: use kvfree() in ipz_queue_{cd}tor() +Applying: target: use kvfree() in session alloc and free +Applying: libcxgbi: use kvfree() in cxgbi_free_big_mem() +Applying: bcache: use kvfree() in various places +Applying: fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void +Applying: MAINTAINERS: update Emulex ocrdma email addresses +Applying: MAINTAINERS: remove website for paride +Applying: MAINTAINERS: update sound soc intel patterns +Applying: MAINTAINERS: update brcm dts pattern +Applying: MAINTAINERS: update brcm gpio filename pattern +Applying: MAINTAINERS: remove unused nbd.h pattern +Applying: MAINTAINERS: move Jens Osterkamp to CREDITS +Applying: MAINTAINERS: BCACHE: Kent Overstreet has changed email address +Using index info to reconstruct a base tree... +M MAINTAINERS +Falling back to patching base and 3-way merge... +Auto-merging MAINTAINERS +Applying: MAINTAINERS: add zpool +Applying: x86: opt into HAVE_COPY_THREAD_TLS, for both 32-bit and 64-bit +Applying: drivers/w1/w1_int.c: call put_device if device_register fails +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + b93e85ff9890...fa4e2c73ae65 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (fa4e2c73ae65 drivers/w1/w1_int.c: call put_device if device_register fails) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + CREDITS | 4 ++ + MAINTAINERS | 33 +++++----- + arch/unicore32/kernel/fpu-ucf64.c | 4 +- + arch/x86/Kconfig | 1 + + arch/x86/kernel/process_32.c | 6 +- + arch/x86/kernel/process_64.c | 8 +-- + drivers/block/nvme-core.c | 30 +++++----- + drivers/gpu/drm/i915/intel_sprite.c | 2 +- + drivers/gpu/drm/i915/intel_tv.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 5 +- + drivers/infiniband/hw/ehca/ipz_pt_fn.c | 10 +--- + drivers/md/bcache/journal.c | 2 +- + drivers/md/bcache/super.c | 10 +--- + drivers/md/bcache/util.h | 10 +--- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 5 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 5 +- + drivers/scsi/cxgbi/libcxgbi.h | 5 +- + drivers/target/target_core_transport.c | 10 +--- + drivers/w1/w1_int.c | 3 +- + fs/seq_file.c | 70 ++++++++++------------ + include/drm/drm_mem_util.h | 5 +- + include/linux/seq_file.h | 19 +++--- + kernel/printk/printk.c | 8 +-- + kernel/relay.c | 5 +- + 24 files changed, 111 insertions(+), 151 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..84c28f8b5855 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 4.1-rc5 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.1-rc5 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..127b9348d083 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20150611 |