diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-28 22:53:55 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-28 22:53:55 +1000 |
| commit | 5d925a7641c8066290ee58eaf4f651a1ea7d9c82 (patch) | |
| tree | fd1142a218e9ce4d9ca019d468dca3c1e517565b | |
| parent | 58d37a74b7d71a5eeea4bfb242a1009755559765 (diff) | |
Add linux-next specific files for 20150528next-20150528
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 220 | ||||
| -rw-r--r-- | Next/Trees | 222 | ||||
| -rw-r--r-- | Next/merge.log | 8753 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 9200 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..d36b1f679702 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,220 @@ +Name SHA1 +---- ---- +origin de182468d1bb726198abaab315820542425270b7 +fixes b94d525e58dc9638dd3f98094cb468bcfb262039 +kbuild-current c517d838eb7d07bbe9507871fab3931deccff539 +arc-current e4140819dadc3624accac8294881bca8a3cba4ed +arm-current 1b97937246d8b97c0760d16d8992c7937bdf5e6a +m68k-current b24f670b7f5b2058b95370caa9f104b3cefb9f1d +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-merge-mpe 5e95235ccd5442d4a4fe11ec4eb99ba1b7959368 +powerpc-merge c517d838eb7d07bbe9507871fab3931deccff539 +sparc acc455cffa75070d55e74fc7802b49edbc080e92 +net 9302d7bb0c5cd46be5706859301f18c137b2439f +ipsec 407d34ef294727bdc200934c38d9a8241f4a5547 +sound-current c545f799c7470682756ca64c63f6bfcdaf28442b +pci-current a6b65983dabceb7ccb1801ee7f5bd421c2704d16 +wireless-drivers aefa441b150279dd8d25658e018898a3fe9a6769 +driver-core.current 194ec9368c0dbc421acdb2620d4dfb3cc3d022ff +tty.current da555db6b06340e3f6b4b0a0448c30bebfe23b0a +usb.current 13557b5d8477cc978b4ef08424f69789858670d0 +usb-gadget-fixes c94e289f195e0e13cf34d27f9338d28221a85751 +usb-serial-fixes 1df5b888f54070a373a73b34488cc78c2365b7b4 +staging.current a8acb4d33d476b5a5f1c549b404bfa49d73cf8b6 +char-misc.current e26081808edadfd257c6c9d81014e3b25e9a6118 +input-current 77b071e7931dd762563ac74e3e448b2aef23ad2f +crypto-current f858c7bcca8c20761a20593439fe998b4b67e86b +ide d681f1166919d6829083c069a83edcd59bfd5e34 +devicetree-current 41d9489319f28f06cf51731131bc353d5a6bce59 +rr-fixes f476893459318cb2eff3ecd2a05d4ceacf82e73e +vfio-fixes db7d4d7f40215843000cb9d441c9149fd42ea36b +kselftest-fixes ba155e2d21f6bf05de86a78dbe5bfd8757604a65 +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +drm-intel-fixes ba155e2d21f6bf05de86a78dbe5bfd8757604a65 +asm-generic 643165c8bbc8617d8222cb50c89e34fe64d226cf +arc e6cd8deb08e948513c14b42134127bae8fa2cc8e +arm 402d170ecb8930351ed31c1f2731f4b4a1db6ed6 +arm-perf b787f68c36d49bb1d9236f403813641efa74a031 +arm-soc ea590202213b601c22d73f4169dc7f25d91c7549 +at91 8720dbd585f221d0cae295470420801b6bdac6b4 +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +rpi 50b674b89355c9d400f9fc00451451412e4944fb +berlin 7f8ad9c26be930eb44b26db67257dbd91e0af8f7 +cortex-m e799b6f37e6ccd7b97e3e2df62a30f1c5b211290 +imx-mxs eb193d2bf19fb3d619555b907dbdad56122dea7f +keystone a6ba4234e474f1caebec211c949846ac2956a332 +mvebu 4c7675d00ca929679c18ff97b0577db78fe0891a +omap f044523a11ca9b32bfa7f663cded1071e55fb51a +omap-pending 30aa18d3bea5f9470af5aa48ab8df88bde97c795 +renesas 613915220fbcf65ce0620c79899b2477d82bc42d +samsung 5c78bc1b466701c1b13d7b734f5b39cdd65babab +sunxi b2c3cb3cd6585422b5b33df45ed9f216af35485d +tegra 44bc5c1cf4c1b677636d0f3a6b7242381264c717 +arm64 05981277a4de1ad631a4b2c39c4fbc1db69b6f23 +blackfin d91e14b3b9e1d8e1d552f4d6aff45551bbb410b1 +c6x 3083ca2376a76072dc0071fb211de80b0ac44bd1 +cris 45f49276cd8a96d17575699e2d5f5a839a7d9fbf +h8300 f9f46b624bf3ae605787ee177d958a43979ac57c +hexagon 8914d7e857807e1e60975000cba3750c9b2643e8 +ia64 078550569eafc6631d333488045159badbeb911a +m68k 2b8520f1f256cdbec68b6c29bfeecc6538ad81f7 +m68knommu ba155e2d21f6bf05de86a78dbe5bfd8757604a65 +metag 40346a0327fed526baeea701a707b65ceeea71ed +microblaze c2219eda547813c0c50dba90d9e989ae36cc3ab8 +mips a11f54e209ec9e4bf366b804dafd2b0e86e917f2 +nios2 1a70db49a735350f221959bf26e9a12f63a743bc +parisc-hd 4b470f120817a16ea28da6141ea6e3a3040b297b +powerpc-mpe c52c8ec5c703140376351673856f34b59e790618 +powerpc 65e7bb2a34fe7b5fc3ae4532308150c600188118 +fsl d41444daba1fd65e5a998c83398f44524f638d07 +mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +s390 7c53fcb39fddb59a9e32c10e96133049ed90930b +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 47ad7b9bbeaac34e43d9dc8db796f1f68194b9ad +uml fe205bdd1321f95f8f3c35d243ea7cb22af8fbe1 +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa ba155e2d21f6bf05de86a78dbe5bfd8757604a65 +btrfs e082f56313f374d723b0366978ddb062c8fe79ea +ceph 84b54fefaa051ac625ada7740bb260a77c35b9b7 +cifs 4afe260bab50290a05e5732570329a530ed023f3 +ecryptfs 6d65261a09adaa374c05de807f73a144d783669e +ext3 792352cb160e654f0b64182550ee702a790fe4d0 +ext4 bee5863ea1b4a0b05a56377a9cd4b955c8393de9 +f2fs af9f9b745b8c2707223ffec828300d472ca65ab9 +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse b2ad14a3738701d0b90cd40341b84af13c2fd2a2 +gfs2 a3e3213676d8208328ef9f79936f94e583c0ec90 +jfs 7d2ac45611b072a24e5014a56a65e6be31c1f884 +nfs feaff8e5b2cfc3eae02cf65db7a400b0b9ffc596 +nfsd fcc47efd5695b595c122b23cbe8ae78676bb3367 +overlayfs cc6f67bcafcb6bbbb2d1be1603dcd95125a52800 +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs 3d99e3fe13d473ac4578c37f477a59b829530764 +ubifs 98fb1ffd8154890d7051750e61ff5548c3ee2ab2 +xfs 5ebe6afaf0057ac3eaeb98defd5456894b446d22 +file-locks 7505256626b0b3d11ea5a3ec1a89046d07c3c366 +vfs b853a16176cf3e02c57e215743015614152c2428 +pci 9b08ae0dde00c20a75cf15636a08e0901c6fe482 +hid 8ff7efa2288c263df737a12d1173469756c4b184 +i2c f6505fbabc426b9e293da5bb702ace2eb1ccf87d +jdelvare-hwmon 3cc49e580f0fa590d128864dcd1016ee7444a8c0 +dmi 9432bf142f77c23e81298a6e9b6e663aa1e1dc41 +hwmon-staging be89ea8251230af9ce9eac693e8b59a766ce1555 +v4l-dvb e7f8fd8aa7f207dc58583750fe511b09f197b060 +kbuild 653ac63df3582eb3c816750248547ceddaecf2d8 +kconfig bfa76d49576599a4b9f9b7a71f23d73d6dcff735 +libata e5802d2554ff48069b5b84cd7bbda21996602342 +pm 701401b85342d199c043deedd4e8275ebc7c5286 +idle a576d08d4eb2c2ca1320e0c9af41ea6383918848 +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +thermal e27f74ae45b3cf38991a44bdb4b0f4b1e50d4fcb +thermal-soc bcacb3e5fd10309d0c33fe0e2b8c55425e73fab6 +ieee1394 d71e6a11737f4b3d857425a1d6f893231cbd1296 +dlm 2ab4bd8ea3a6954bc79a9bbeb291cd6c2d6213a7 +swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8 +slave-dma a847a6d25f6ded4968d1af283272ea3e6ab87961 +net-next ed2dfd900992aa7b6b3d0abd8ec9a7e9d2c7f827 +ipsec-next 8faf491e642011f449d6405be52bedb70964aed6 +wireless-drivers-next f3550aeb7fcd893a52ebf89a064fc95be57f29d1 +bluetooth b5a61c306b0dddb28e3a3ab5d782c73e5f665497 +infiniband c1c2fef6cfb04cf30a56bb37cff40d3498d7edbf +rdma 92eb8ce1ac0dd96016680bc48b3a93dbff15c3d5 +mtd e26081808edadfd257c6c9d81014e3b25e9a6118 +l2-mtd 636fdbf88efe069f9951d1b7df8d3fd82060dc60 +crypto d725332208ef13241fc435eece790c9d0ea16a4e +drm c6e7e4bb7ff988e7f915526a80ea866d84aac720 +drm-panel dd0150026901b3fc73bd76bb423bacf5cc10393d +drm-intel 99c044d7d5cc65661436f271754c011d0f1a02de +drm-tegra 535a65db484ff4e4654a037f2ea7e1ff21431b77 +drm-misc 5ceecb2fa720c01a97e6fa2353c2b8f1e8d69f1f +drm-exynos 9aeb8acbf0a2f278207d4d878992a1fa64905ac2 +drm-msm d5af49c92a8aff8236e7b0bb35e9af364000c017 +sound cd6a65036f0eac4ad83dc371bb458e9e6ba6e306 +sound-asoc ebd5c5adfb888cfa7fea47b4a3eb9c5b8615409e +modules 6727bb9c6abe836d88191ce13bfdd7a53c245e15 +input e002273b37821941623d231b5c7346778b486c9b +block cca58e6fe213ab09a568ce8be84bebc66d821e43 +device-mapper a3554ba000daa71d06f4bf7968c1ac1813f6c3a3 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh 26225be7aef45730214d398861c557978e30e4c2 +kgdb 2d289f14f00a0da6bae7c8415fc8dd9d030458b8 +md 181effb6da11304cd49e3f9844cd8067af6a6f67 +mfd 79a1726fd29c47df090d19667fdfe1b3b600b9c5 +backlight a7f6d457139389d0d40f3c8992bf78e2536ab2ba +battery 843735b788a4e49c453f4aefdae80e6dfbe9ee85 +omap_dss2 36520841a443d5ee966f9632c417fcc8a25e07e3 +regulator f114db4aa4daa6d1b878df52efd819b2b894e9de +security 8d94eb9b5cff350ba170848c862ca0006d33d496 +integrity 8d94eb9b5cff350ba170848c862ca0006d33d496 +selinux 6f29997f4a3117169eeabd41dbea4c1bd94a739c +lblnet b2776bf7149bddd1f4161f14f79520f17fc1d71d +watchdog ba155e2d21f6bf05de86a78dbe5bfd8757604a65 +iommu 60dcc6f0bcf470715df7238311fa3508ab64a2fb +dwmw2-iommu 4ed6a540fab8ea4388c1703b73ecfed68a2009d1 +vfio 5a0ff17741c1785b27229a16b5ab77470d71b170 +osd 1fa3a002b2546c42c343c77c144871285896ced5 +jc_docs bde1b29420d71a17d87332db8e20229f251d6c14 +trivial 79ce48df755e6a5231cc1ac515e7988e1d715ce1 +audit 39a8804455fb23f09157341d3ba7db6d7ae6ee76 +devicetree a2166ca5f3204794e8b59f01c93a0f1564e3e138 +dt-rh 4760597116e34bd58f670d008ae7323653268fb4 +mailbox 4c0f74bf82e8295ce711da81774178769f6f8215 +spi 3f6d0d8e200025c14f90344bfa060eab81d60033 +tip a079e986132bcdcbefc7bb4415ad2aeca699031b +clockevents 645d558b1cd5d489cbeb23c37a4b9dd7d113f329 +edac fec53af531dd040e41fe358abe00b33747af2688 +edac-amd 30c7469ba6f5eccf33ac33ec7cb19414f50cf3bf +irqchip a8bcdc32fafbeb236910e6ddc0161003a458ffc1 +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace d0ee8f4a1f5f3df933cdc9a80f5dea13e2fb5022 +rcu d254f32b7c0376bd2b9174df41333824fb734804 +kvm 3520469d65f26a1cd2f610f5d5de976f78db74fe +kvm-arm 2fa462f826210bbec65f8ed06d5ef4e0cd4f5450 +kvm-ppc b79013b2449c23f1f505bdf39c5a6c330338b244 +kvms390 06b36753a6466239fc945b6756e12d635621ae5f +xen-tip ffb7dbed47da6ac4460b606a3feee295bbe4d9e2 +percpu 4c907baf36d8339f393bb576d0bab29194d0e6ad +workqueues 5b7fedea8db6151ef452c155b09bdae4a05ac3b5 +drivers-x86 61104aa44529d59bd01a5d51df571ca2823a04b3 +chrome-platform 96cba9b00e297303774bec59e192064d20adeb3d +regmap 67f2271e4ceaf576faad0855328fea4caad816af +hsi 265ef3ee9575e6d150f485d28dbe153a50d27f4c +leds 589fca16c14adec7ebeb601e22850826e18b8f8d +ipmi c32e9840e96ad7812c3e1e6cd84f8780ed921988 +driver-core e0fd9b1d9c44c0966e322046912a0a0bce237d42 +tty a5edce42184844239bc209c727435654cd0b5f2d +usb 2cfef79ddce42e9604293424381b2e59913f600c +usb-gadget 94a715ed5c57e43f216a4fe85a3604a574c08515 +usb-serial e26081808edadfd257c6c9d81014e3b25e9a6118 +staging f1a9983002cd9d849b37b88d44c89edef7a291ee +char-misc 039ae58503f3349157a852c2cd5555a630f0bfaf +extcon 046050f6e623e442e9c71c525462ebd395dae526 +kdbus 9fb9cd0f4434a23487b6ef3237e733afae90e336 +cgroup b5ba75b5fc0e8404e2c50cb68f39bb6a53fc916f +scsi d56dfb41f5354209e077479a8b75271e550c034b +target-updates 9cfc3ea41c4f9db514a7fdde9b77657b5aeaa46c +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +pinctrl bb1b6503dff1972bde2b24f56ea8af0b069f5e25 +vhost f4aaa799cf9aed1467918743ad0f0823c880ce39 +remoteproc 172e6ab1caffcd2dd2910b44d88d096f2c6985fa +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio 1ab4363bd9fbb5f23184a62869072a6848fe144a +dma-mapping 5ebe6afaf0057ac3eaeb98defd5456894b446d22 +pwm cccb94543c8299e0bc7564cc6f8b26e0f15bafde +dma-buf 5136629dc5a19701746abd7c8ad98ce0b84dda1d +userns 14d419c079ab27f584e2e3f34653499d8ea374c8 +ktest 7c2c49eceb79eb4738f38a00270830057b5bfb76 +clk 5343325ff3dd299f459fa9dacbd95dca5c9bf215 +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +aio 5f785de588735306ec4d7c875caf9d28481c8b21 +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +kselftest 390db010c96091bd3bd0c5d6c0b667d22290ef41 +y2038 ed8c2241c1ae1b64e4a783ae7a2c685c93142a8d +luto-misc a6c5170d1edea97c538c81e377e56c7b5c5b7e63 +access_once bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 +livepatching bc1cdfd174669a98df5428b35849d285d2acb79e +coresight 486ea46dfc88f4df79e9bf9e77c8579c1ff29152 +rtc f1644dff27abb34b2c9cc7c0eca2cc4e39f936b7 +akpm-current 2201268393aac581d022fc25f5452a8d14bdc49a +akpm a8d618f47f324710bc2934931190375f47e221bc diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..9fec9713e030 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,222 @@ +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 +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +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 +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 +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..ced0fcce1dab --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8753 @@ +$ date +Thursday 28 May 11:19:38 AEST 2015 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at a8b253b9f253 Merge tag 'pinctrl-v4.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl +Merging origin/master (de182468d1bb Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge origin/master +Updating a8b253b9f253..de182468d1bb +Fast-forward + Documentation/ABI/testing/sysfs-devices-system-cpu | 2 +- + arch/alpha/boot/Makefile | 16 +- + arch/alpha/boot/main.c | 1 - + arch/alpha/boot/stdio.c | 306 +++++++++++++++++++++ + arch/alpha/boot/tools/objstrip.c | 3 + + arch/alpha/include/asm/types.h | 1 - + arch/alpha/include/asm/unistd.h | 2 +- + arch/alpha/include/uapi/asm/unistd.h | 3 + + arch/alpha/kernel/err_ev6.c | 1 - + arch/alpha/kernel/irq.c | 1 - + arch/alpha/kernel/osf_sys.c | 3 +- + arch/alpha/kernel/process.c | 7 +- + arch/alpha/kernel/smp.c | 8 +- + arch/alpha/kernel/srmcons.c | 3 +- + arch/alpha/kernel/sys_marvel.c | 2 +- + arch/alpha/kernel/systbls.S | 3 + + arch/alpha/kernel/traps.c | 1 - + arch/alpha/oprofile/op_model_ev4.c | 1 - + arch/alpha/oprofile/op_model_ev5.c | 1 - + arch/alpha/oprofile/op_model_ev6.c | 1 - + arch/alpha/oprofile/op_model_ev67.c | 1 - + arch/x86/kernel/cpu/mcheck/mce.c | 7 +- + arch/x86/kernel/i387.c | 15 + + arch/x86/net/bpf_jit_comp.c | 7 +- + crypto/Kconfig | 9 - + drivers/lguest/core.c | 2 +- + drivers/mfd/da9052-core.c | 8 +- + drivers/net/ethernet/ibm/emac/core.c | 16 +- + drivers/net/ethernet/ibm/emac/core.h | 7 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 9 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 6 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 76 +++-- + drivers/net/phy/amd-xgbe-phy.c | 45 ++- + drivers/net/phy/bcm7xxx.c | 2 +- + drivers/net/phy/dp83640.c | 23 +- + drivers/net/wireless/iwlwifi/Kconfig | 1 + + drivers/net/wireless/iwlwifi/iwl-7000.c | 16 +- + drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 5 + + drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 3 + + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 30 +- + drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/d3.c | 22 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 3 - + drivers/net/wireless/iwlwifi/mvm/ops.c | 6 +- + drivers/net/wireless/iwlwifi/mvm/rs.c | 3 + + drivers/net/wireless/iwlwifi/pcie/trans.c | 8 +- + drivers/net/xen-netback/xenbus.c | 1 + + drivers/net/xen-netfront.c | 15 +- + drivers/regulator/da9052-regulator.c | 5 +- + drivers/ssb/driver_pcicore.c | 7 +- + drivers/video/backlight/pwm_bl.c | 4 + + fs/cifs/cifs_dfs_ref.c | 3 +- + fs/cifs/cifs_unicode.c | 182 ++++++++---- + fs/cifs/cifsfs.c | 2 + + fs/cifs/cifsproto.h | 4 +- + fs/cifs/cifssmb.c | 23 +- + fs/cifs/connect.c | 3 +- + fs/cifs/dir.c | 3 +- + fs/cifs/file.c | 7 +- + fs/cifs/inode.c | 31 ++- + fs/cifs/link.c | 3 +- + fs/cifs/readdir.c | 2 + + fs/cifs/smb1ops.c | 3 +- + fs/cifs/smb2pdu.c | 2 +- + fs/overlayfs/copy_up.c | 3 + + fs/overlayfs/dir.c | 33 ++- + fs/overlayfs/super.c | 10 +- + include/linux/brcmphy.h | 2 +- + include/net/sctp/sctp.h | 7 +- + net/caif/caif_socket.c | 8 + + net/mac80211/cfg.c | 59 +--- + net/mac80211/ieee80211_i.h | 9 +- + net/mac80211/iface.c | 6 + + net/mac80211/key.c | 82 +++++- + net/mac80211/key.h | 1 + + net/mac80211/rx.c | 5 +- + net/mac80211/util.c | 3 + + net/sched/sch_api.c | 10 +- + net/unix/af_unix.c | 8 + + tools/net/bpf_jit_disasm.c | 2 + + 81 files changed, 947 insertions(+), 305 deletions(-) + create mode 100644 arch/alpha/boot/stdio.c +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 (1b97937246d8 ARM: fix missing syscall trace exit) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/kernel/entry-common.S | 4 +++- + arch/arm/mm/mmu.c | 20 ++++++++++---------- + 2 files changed, 13 insertions(+), 11 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 (5e95235ccd54 powerpc: Align TOC to 256 bytes) +$ 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 (acc455cffa75 sparc64: Setup sysfs to mark LDOM sockets, cores and threads correctly) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/include/asm/cpudata_64.h | 3 +- + arch/sparc/include/asm/topology_64.h | 3 +- + arch/sparc/kernel/mdesc.c | 136 ++++++++++++++++++++++++++++------- + arch/sparc/kernel/smp_64.c | 13 ++++ + 4 files changed, 127 insertions(+), 28 deletions(-) +Merging net/master (9302d7bb0c5c sctp: Fix mangled IPv4 addresses on a IPv6 listening socket) +$ git merge net/master +Already up-to-date. +Merging ipsec/master (407d34ef2947 xfrm: Always zero high-order sequence number bits) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/esp4.c | 3 ++- + net/ipv6/esp6.c | 3 ++- + net/xfrm/xfrm_replay.c | 2 ++ + net/xfrm/xfrm_state.c | 2 +- + 4 files changed, 7 insertions(+), 3 deletions(-) +Merging sound-current/for-linus (c545f799c747 ALSA: hda - Disable power_save_node for IDT92HD71bxx) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/hda_generic.c | 5 ++++- + sound/pci/hda/hda_intel.c | 2 ++ + sound/pci/hda/patch_realtek.c | 2 +- + sound/pci/hda/patch_sigmatel.c | 4 ++-- + sound/pci/hda/patch_via.c | 1 - + sound/pci/hda/thinkpad_helper.c | 1 - + sound/usb/quirks.c | 1 + + 7 files changed, 10 insertions(+), 6 deletions(-) +Merging pci-current/for-linus (a6b65983dabc PCI: Fix IOV resource sorting by alignment requirement) +$ git merge pci-current/for-linus +Recorded preimage for 'MAINTAINERS' +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 67da87d36850] Merge remote-tracking branch 'pci-current/for-linus' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 +++- + drivers/pci/setup-bus.c | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) +Merging wireless-drivers/master (aefa441b1502 Merge tag 'iwlwifi-for-kalle-2015-05-21' 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 (194ec9368c0d drivers: of/base: move of_init to driver_init) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + drivers/base/init.c | 2 ++ + drivers/of/base.c | 8 +++----- + include/linux/of.h | 6 ++++++ + 3 files changed, 11 insertions(+), 5 deletions(-) +Merging tty.current/tty-linus (da555db6b063 n_tty: Fix calculation of size in canon_copy_from_read_buf) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/n_tty.c | 4 ++-- + drivers/tty/serial/amba-pl011.c | 16 ++++++++-------- + drivers/tty/serial/imx.c | 8 ++++++++ + 3 files changed, 18 insertions(+), 10 deletions(-) +Merging usb.current/usb-linus (13557b5d8477 Merge tag 'fixes-for-v4.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/renesas_usbhs.txt | 6 +-- + drivers/phy/Kconfig | 10 ++-- + drivers/phy/phy-core.c | 4 +- + drivers/phy/phy-omap-usb2.c | 1 + + drivers/phy/phy-rcar-gen2.c | 4 +- + drivers/usb/dwc3/core.h | 4 +- + drivers/usb/gadget/function/f_fs.c | 15 +++--- + drivers/usb/gadget/function/f_midi.c | 8 ++- + drivers/usb/gadget/function/f_uac1.c | 5 +- + drivers/usb/gadget/legacy/g_ffs.c | 4 +- + drivers/usb/gadget/udc/s3c2410_udc.c | 2 +- + drivers/usb/host/xhci.c | 57 ++++++++++++++-------- + drivers/usb/host/xhci.h | 2 + + drivers/usb/musb/musb_core.c | 14 +++--- + drivers/usb/phy/phy-ab8500-usb.c | 6 +-- + drivers/usb/phy/phy-tahvo.c | 3 +- + drivers/usb/renesas_usbhs/fifo.c | 38 +++++++++++---- + 17 files changed, 120 insertions(+), 63 deletions(-) +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 (1df5b888f540 USB: serial: ftdi_sio: Add support for a Motion Tracker Development Board) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio_ids.h | 1 + + 2 files changed, 2 insertions(+) +Merging staging.current/staging-linus (a8acb4d33d47 Merge tag 'iio-fixes-for-4.1b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/adc/twl6030-gpadc.c | 2 +- + drivers/iio/imu/adis16400.h | 2 ++ + drivers/iio/imu/adis16400_buffer.c | 26 ++++++++++++++++-------- + drivers/iio/imu/adis16400_core.c | 41 +++++++++++++++++++++++++++----------- + 4 files changed, 50 insertions(+), 21 deletions(-) +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 (77b071e7931d Input: smtpe-ts - wait 50mS until polling for pen-up) +$ 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 (41d9489319f2 drivers/of: Add empty ranges quirk for PA-Semi) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (8829fd02186d cpumask_set_cpu_local_first => cpumask_local_spread, lament) +$ git merge rr-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/net/ethernet/emulex/benet/be_main.c | 6 +-- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 10 ++-- + include/linux/cpumask.h | 6 +-- + kernel/module.c | 3 ++ + lib/cpumask.c | 74 +++++++++----------------- + 5 files changed, 37 insertions(+), 62 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 70866de89ca2 Merge remote-tracking branch 'staging.current/staging-linus' +Merging next-20150527 version of rr-fixes +$ git merge -m next-20150527/rr-fixes f476893459318cb2eff3ecd2a05d4ceacf82e73e +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 (ba155e2d21f6 Linux 4.1-rc5) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +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 (e6cd8deb08e9 ARC: explicit'ify uboot support) +$ 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 +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 34 ++--- + arch/arc/Makefile | 8 +- + arch/arc/boot/dts/Makefile | 2 +- + arch/arc/boot/dts/{angel4.dts => nsim_700.dts} | 2 +- + 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 | 2 +- + arch/arc/kernel/head.S | 2 + + arch/arc/kernel/setup.c | 17 ++- + 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-sim/Kconfig | 14 ++ + arch/arc/{plat-arcfpga => plat-sim}/Makefile | 3 - + arch/arc/{plat-arcfpga => plat-sim}/platform.c | 17 +-- + 23 files changed, 77 insertions(+), 508 deletions(-) + rename arch/arc/boot/dts/{angel4.dts => nsim_700.dts} (97%) + 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-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 (402d170ecb89 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/mach-pxa/lubbock.c +Auto-merging arch/arm/mach-exynos/suspend.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/booting-without-of.txt | 4 + + arch/arm/Kconfig | 17 +- + arch/arm/Makefile | 4 + + arch/arm/boot/compressed/head.S | 4 +- + 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/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/proc-fns.h | 7 - + arch/arm/include/asm/smp.h | 2 +- + arch/arm/include/asm/system_info.h | 1 + + arch/arm/include/asm/unified.h | 2 - + arch/arm/kernel/Makefile | 1 + + 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 | 8 +- + arch/arm/kernel/head.S | 50 +++-- + arch/arm/kernel/module-plts.c | 181 +++++++++++++++ + arch/arm/kernel/module.c | 32 ++- + arch/arm/kernel/module.lds | 4 + + arch/arm/kernel/setup.c | 30 ++- + arch/arm/kernel/sleep.S | 2 +- + arch/arm/kernel/smp.c | 10 +- + arch/arm/kvm/interrupts.S | 2 +- + arch/arm/lib/call_with_stack.S | 2 +- + arch/arm/mach-davinci/da850.c | 1 + + arch/arm/mach-exynos/suspend.c | 8 +- + arch/arm/mach-hisi/platmcpm.c | 127 ++++------- + arch/arm/mach-keystone/keystone.c | 41 ++-- + arch/arm/mach-keystone/platsmp.c | 13 -- + arch/arm/mach-lpc32xx/clock.c | 5 +- + arch/arm/mach-omap1/board-nokia770.c | 2 +- + arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 12 +- + arch/arm/mach-omap2/omap_device.c | 24 +- + arch/arm/mach-pxa/eseries.c | 1 + + arch/arm/mach-pxa/lubbock.c | 1 + + arch/arm/mach-pxa/tosa.c | 1 + + arch/arm/mach-sa1100/irq.c | 2 +- + arch/arm/mm/Kconfig | 19 ++ + arch/arm/mm/Makefile | 1 + + arch/arm/mm/cache-l2x0.c | 87 +++++--- + 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 | 182 ++++++++------- + 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/cpuidle/cpuidle-big_little.c | 8 +- + include/linux/clk.h | 27 +-- + include/linux/clkdev.h | 6 +- + sound/soc/sh/migor.c | 3 +- + 67 files changed, 1074 insertions(+), 742 deletions(-) + create mode 100644 arch/arm/kernel/module-plts.c + create mode 100644 arch/arm/kernel/module.lds + create mode 100644 arch/arm/mm/pv-fixup-asm.S +Merging arm-perf/for-next/perf (b787f68c36d4 Linux 4.1-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (ea590202213b arm-soc: document merges) +$ git merge arm-soc/for-next +Removing include/soc/at91/at91rm9200_sdramc.h +Removing arch/arm64/boot/dts/skeleton.dtsi +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-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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + 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/cpus.txt | 1 + + Documentation/devicetree/bindings/arm/fsl.txt | 3 + + .../devicetree/bindings/arm/marvell,berlin.txt | 100 +- + .../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/pinctrl/berlin,pinctrl.txt | 43 + + .../devicetree/bindings/reset/berlin,reset.txt | 23 + + .../bindings/reset/brcm,bcm63138-pmb.txt | 19 + + Documentation/devicetree/bindings/spi/sh-msiof.txt | 2 +- + .../devicetree/bindings/usb/atmel-usb.txt | 25 + + .../devicetree/bindings/vendor-prefixes.txt | 5 + + MAINTAINERS | 31 + + arch/arm/Kconfig | 68 +- + arch/arm/Kconfig.debug | 53 +- + arch/arm/Makefile | 4 + + arch/arm/arm-soc-for-next-contents.txt | 179 +++ + arch/arm/boot/dts/Makefile | 48 +- + arch/arm/boot/dts/am335x-boneblack.dts | 4 - + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +- + arch/arm/boot/dts/armada-38x.dtsi | 2 +- + 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/imx27.dtsi | 2 +- + arch/arm/boot/dts/integrator.dtsi | 4 +- + arch/arm/boot/dts/kizbox.dts | 150 --- + 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/omap3-devkit8000.dts | 2 + + 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/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 | 44 +- + arch/arm/boot/dts/r8a7791-henninger.dts | 2 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 4 +- + arch/arm/boot/dts/r8a7791.dtsi | 42 +- + arch/arm/boot/dts/r8a7794.dtsi | 9 + + 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 | 166 +++ + 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/configs/at91_dt_defconfig | 2 + + arch/arm/configs/efm32_defconfig | 2 +- + arch/arm/configs/hisi_defconfig | 2 + + arch/arm/configs/lpc18xx_defconfig | 152 +++ + arch/arm/configs/multi_v7_defconfig | 82 +- + 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/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 | 38 +- + arch/arm/mach-imx/Makefile.boot | 0 + 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/devices.c | 4 +- + arch/arm/mach-omap2/fb.c | 2 +- + arch/arm/mach-omap2/omap-wakeupgen.c | 2 +- + 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/pxa_cplds_irqs.c | 2 +- + arch/arm/mach-pxa/raumfeld.c | 1 - + arch/arm/mach-pxa/tosa.c | 1 - + arch/arm/mach-socfpga/Kconfig | 1 + + arch/arm/mach-socfpga/core.h | 1 - + 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/skeleton.dtsi | 13 - + arch/arm64/configs/defconfig | 6 + + drivers/ata/Kconfig | 1 - + drivers/ata/pata_at91.c | 92 +- + drivers/bus/arm-ccn.c | 270 ++++- + drivers/clk/berlin/bg2.c | 7 +- + drivers/clk/berlin/bg2q.c | 7 +- + drivers/clk/pxa/clk-pxa27x.c | 32 +- + 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/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/bcm2835.h | 27 + + include/linux/irq.h | 2 + + include/linux/irqdomain.h | 8 +- + include/linux/mfd/syscon/atmel-mc.h | 144 +++ + include/linux/reset/bcm63xx_pmb.h | 88 ++ + 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 + + 414 files changed, 17826 insertions(+), 9206 deletions(-) + create mode 100644 Documentation/arm/stm32/overview.txt + create mode 100644 Documentation/arm/stm32/stm32f429-overview.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 arch/arm/arm-soc-for-next-contents.txt + 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/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 + 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 + 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 + delete mode 100644 arch/arm64/boot/dts/skeleton.dtsi + create mode 100644 drivers/memory/tegra/tegra124-emc.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 + delete mode 100644 include/soc/at91/at91rm9200_sdramc.h + create mode 100644 include/soc/tegra/emc.h +Merging at91/at91-next (8720dbd585f2 Merge tag 'at91-dt3' into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +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 (eb193d2bf19f 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/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/mach-cpuimx35.c +Removing arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.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 735869854ef1] 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 | 6 + + 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-cubox-i.dts | 5 +- + arch/arm/boot/dts/imx6dl-gw551x.dts | 55 ++ + arch/arm/boot/dts/imx6dl-hummingboard.dts | 5 +- + 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-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/configs/imx_v6_v7_defconfig | 9 + + arch/arm/include/debug/imx-uart.h | 15 +- + arch/arm/mach-imx/Kconfig | 41 +- + 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/eukrea_mbimxsd35-baseboard.c | 318 ------ + arch/arm/mach-imx/gpc.c | 3 +- + arch/arm/mach-imx/hardware.h | 1 + + arch/arm/mach-imx/iomux-imx31.c | 2 +- + arch/arm/mach-imx/mach-cpuimx35.c | 206 ---- + 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 | 13 +- + 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 | 16 +- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c | 13 +- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx25.c | 6 +- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx27.c | 14 +- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx31.c | 34 +- + {arch/arm/mach-imx => drivers/clk/imx}/clk-imx35.c | 35 +- + .../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 | 21 +- + include/dt-bindings/clock/imx7d-clock.h | 450 +++++++++ + include/dt-bindings/clock/vf610-clock.h | 3 +- + include/soc/imx/revision.h | 37 + + 90 files changed, 5447 insertions(+), 861 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-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-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 + 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-imx/mach-imx7d.c + create mode 100644 arch/arm/mach-imx/suspend-imx53.S + 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 (92%) + rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c (96%) + 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 (92%) + 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 (88%) + create mode 100644 include/dt-bindings/clock/imx7d-clock.h + create mode 100644 include/soc/imx/revision.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 (4c7675d00ca9 Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 3 + + 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 | 6 +- + 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-linksys-mamba.dts | 5 + + arch/arm/boot/dts/armada-xp-synology-ds414.dts | 2 +- + arch/arm/boot/dts/armada-xp.dtsi | 8 + + 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 +- + 36 files changed, 973 insertions(+), 32 deletions(-) + 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 +Merging omap/for-next (f044523a11ca Merge branch 'omap-for-v4.2/dt' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 2 + + 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/logicpd-torpedo-37xx-devkit.dts | 157 +++++++ + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 162 +++++++ + 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/mach-omap2/control.c | 3 + + arch/arm/mach-omap2/control.h | 3 + + arch/arm/mach-omap2/pdata-quirks.c | 22 + + include/dt-bindings/pinctrl/am43xx.h | 1 + + 16 files changed, 1237 insertions(+), 17 deletions(-) + create mode 100644 arch/arm/boot/dts/am335x-baltos-ir5221.dts + create mode 100644 arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts + create mode 100644 arch/arm/boot/dts/logicpd-torpedo-som.dtsi +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. +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 da74a130f89e] 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 +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r8a7778-bockw-reference.dts | 2 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 2 +- + arch/arm/boot/dts/r8a7790-lager.dts | 2 +- + arch/arm/boot/dts/r8a7790.dtsi | 22 ++++++++++++++++ + arch/arm/boot/dts/r8a7791-henninger.dts | 2 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +- + arch/arm/boot/dts/r8a7791.dtsi | 37 +++++++++++++++++++++++++++ + arch/arm/boot/dts/r8a7794.dtsi | 36 ++++++++++++++++++++++++++ + arch/arm/configs/multi_v7_defconfig | 3 +++ + arch/arm/mach-shmobile/Kconfig | 4 +-- + 10 files changed, 105 insertions(+), 7 deletions(-) +Merging samsung/for-next (5c78bc1b4667 Merge branch 'samsung-defconfig-2nd' into for-next) +$ git merge samsung/for-next +Auto-merging arch/arm/mach-exynos/suspend.c +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 +- + arch/arm/boot/dts/exynos3250-monk.dts | 3 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 7 +- + arch/arm/boot/dts/exynos3250.dtsi | 15 +- + arch/arm/boot/dts/exynos4.dtsi | 12 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 11 +- + arch/arm/boot/dts/exynos4415.dtsi | 4 +- + arch/arm/boot/dts/exynos4x12.dtsi | 4 + + arch/arm/boot/dts/exynos5250-smdk5250.dts | 12 + + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 24 +- + arch/arm/boot/dts/exynos5420.dtsi | 24 +- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 99 ++- + arch/arm/configs/exynos_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 | 44 +- + 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 + + 29 files changed, 2268 insertions(+), 83 deletions(-) + 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 (b2c3cb3cd658 Merge branches 'sunxi/core-for-4.2' and '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 | 1 + + .../devicetree/bindings/soc/sunxi/sram.txt | 64 ++++++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 6 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 7 + + arch/arm/boot/dts/sun8i-a23-evb.dts | 129 +++++++++++ + 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 | 4 +- + drivers/clk/sunxi/clk-sun9i-core.c | 10 +- + drivers/clk/sunxi/clk-sunxi.c | 2 + + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/sunxi/Kconfig | 10 + + drivers/soc/sunxi/Makefile | 1 + + drivers/soc/sunxi/sunxi_sram.c | 236 +++++++++++++++++++++ + include/linux/soc/sunxi/sunxi_sram.h | 24 +++ + 19 files changed, 511 insertions(+), 13 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/sunxi/sram.txt + create mode 100644 arch/arm/boot/dts/sun8i-a23-evb.dts + 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/linux/soc/sunxi/sunxi_sram.h +Merging tegra/for-next (44bc5c1cf4c1 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 | 255 ++- + 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, 4194 insertions(+), 469 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 (05981277a4de arm64: Use common outgoing-CPU-notification code) +$ git merge arm64/for-next/core +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/acpi.h | 4 + + arch/arm64/include/asm/cacheflush.h | 5 - + arch/arm64/include/asm/cpu_ops.h | 27 ++-- + arch/arm64/include/asm/io.h | 8 +- + arch/arm64/include/asm/perf_event.h | 7 ++ + arch/arm64/include/asm/proc-fns.h | 4 - + arch/arm64/include/asm/smp.h | 2 +- + arch/arm64/include/asm/system_misc.h | 1 - + arch/arm64/kernel/acpi.c | 124 ------------------ + arch/arm64/kernel/cpu_ops.c | 72 ++++++----- + arch/arm64/kernel/cpuidle.c | 7 +- + arch/arm64/kernel/perf_event.c | 2 +- + arch/arm64/kernel/process.c | 12 +- + arch/arm64/kernel/psci.c | 11 +- + arch/arm64/kernel/setup.c | 7 +- + arch/arm64/kernel/smp.c | 236 ++++++++++++++++++++++++++--------- + arch/arm64/kernel/smp_spin_table.c | 8 +- + arch/arm64/mm/cache.S | 73 ----------- + arch/arm64/mm/flush.c | 1 - + arch/arm64/mm/proc.S | 46 ------- + 21 files changed, 273 insertions(+), 385 deletions(-) +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 (45f49276cd8a CRISv32: allow CONFIG_DEBUG_BUGVERBOSE) +$ git merge cris/for-next +Merge made by the 'recursive' strategy. + arch/cris/Kconfig | 1 + + arch/cris/arch-v32/drivers/mach-fs/gpio.c | 3 +-- + arch/cris/include/arch-v32/arch/bug.h | 11 +++++++++-- + 3 files changed, 11 insertions(+), 4 deletions(-) +Merging h8300/h8300-next (f9f46b624bf3 Merge branch 'master' into h8300-next) +$ git merge h8300/h8300-next +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/clk/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + 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 | 11 + + 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 | 7 + + 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 (2b8520f1f256 m68k: Use for_each_sg()) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/amiga_defconfig | 9 +++++++-- + arch/m68k/configs/apollo_defconfig | 9 +++++++-- + arch/m68k/configs/atari_defconfig | 9 +++++++-- + arch/m68k/configs/bvme6000_defconfig | 9 +++++++-- + arch/m68k/configs/hp300_defconfig | 9 +++++++-- + arch/m68k/configs/mac_defconfig | 9 +++++++-- + arch/m68k/configs/multi_defconfig | 9 +++++++-- + arch/m68k/configs/mvme147_defconfig | 9 +++++++-- + arch/m68k/configs/mvme16x_defconfig | 9 +++++++-- + arch/m68k/configs/q40_defconfig | 9 +++++++-- + arch/m68k/configs/sun3_defconfig | 9 +++++++-- + arch/m68k/configs/sun3x_defconfig | 9 +++++++-- + arch/m68k/kernel/dma.c | 19 ++++++++++++------- + 13 files changed, 96 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 (c2219eda5478 microblaze: Fix syscall error recovery for invalid syscall IDs) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (a11f54e209ec Merge branch '4.1-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 1 + + arch/mips/bcm47xx/nvram.c | 22 +++--- + arch/mips/bcm47xx/setup.c | 3 - + arch/mips/bcm47xx/sprom.c | 53 +++++++------ + arch/mips/configs/fuloong2e_defconfig | 2 +- + arch/mips/configs/maltasmvp_defconfig | 17 ++--- + arch/mips/include/asm/hazards.h | 52 +++++++++++++ + arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 4 - + arch/mips/include/asm/mipsregs.h | 22 ++++++ + arch/mips/kernel/Makefile | 1 + + arch/mips/kernel/irq.c | 2 +- + arch/mips/kernel/sysrq.c | 77 +++++++++++++++++++ + arch/mips/kernel/traps.c | 7 +- + arch/mips/lib/dump_tlb.c | 110 +++++++++++++++++---------- + arch/mips/lib/r3k_dump_tlb.c | 13 ++-- + arch/mips/netlogic/xlr/platform-flash.c | 3 - + drivers/bus/mips_cdmm.c | 4 +- + drivers/tty/mips_ejtag_fdc.c | 17 +++-- + drivers/tty/sysrq.c | 1 + + include/linux/ssb/ssb.h | 8 +- + 20 files changed, 305 insertions(+), 114 deletions(-) + create mode 100644 arch/mips/kernel/sysrq.c +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 (c52c8ec5c703 powerpc/powernv: Move dma_set_mask() from pnv_phb to pci_controller_ops) +$ git merge powerpc-mpe/next +Auto-merging arch/powerpc/platforms/pasemi/msi.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/vfio.txt | 12 + + MAINTAINERS | 7 +- + arch/powerpc/Kconfig.debug | 8 + + arch/powerpc/Makefile | 17 +- + arch/powerpc/include/asm/cputhreads.h | 13 +- + arch/powerpc/include/asm/eeh.h | 9 +- + arch/powerpc/include/asm/machdep.h | 6 - + arch/powerpc/include/asm/opal-api.h | 7 + + arch/powerpc/include/asm/opal.h | 7 + + arch/powerpc/include/asm/page.h | 4 +- + arch/powerpc/include/asm/pci-bridge.h | 8 + + arch/powerpc/include/asm/pgtable-ppc64.h | 2 +- + arch/powerpc/include/asm/systbl.h | 2 +- + arch/powerpc/include/uapi/asm/eeh.h | 56 ++++ + arch/powerpc/kernel/Makefile | 3 +- + arch/powerpc/kernel/dma.c | 8 + + arch/powerpc/kernel/eeh.c | 37 ++- + arch/powerpc/kernel/eeh_cache.c | 16 +- + arch/powerpc/kernel/eeh_driver.c | 2 +- + arch/powerpc/kernel/msi.c | 11 +- + arch/powerpc/kernel/setup_64.c | 3 +- + arch/powerpc/kernel/vdso.c | 135 +++++----- + arch/powerpc/platforms/Kconfig.cputype | 11 + + arch/powerpc/platforms/cell/axon_msi.c | 5 +- + arch/powerpc/platforms/pasemi/Makefile | 1 + + .../mpic_pasemi_msi.c => platforms/pasemi/msi.c} | 13 +- + arch/powerpc/platforms/powernv/Makefile | 4 +- + 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-sensor.c | 3 +- + arch/powerpc/platforms/powernv/opal-sysparam.c | 31 ++- + arch/powerpc/platforms/powernv/opal-wrappers.S | 1 + + arch/powerpc/platforms/powernv/opal.c | 196 +++----------- + arch/powerpc/platforms/powernv/pci-ioda.c | 23 +- + arch/powerpc/platforms/powernv/pci-p5ioc2.c | 10 +- + arch/powerpc/platforms/powernv/pci.c | 26 +- + arch/powerpc/platforms/powernv/pci.h | 6 +- + 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 | 8 +- + 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 | 2 +- + arch/powerpc/sysdev/xics/xics-common.c | 2 +- + arch/powerpc/sysdev/xilinx_intc.c | 2 +- + drivers/char/ipmi/ipmi_powernv.c | 39 +-- + drivers/tty/hvc/hvc_opal.c | 33 +-- + drivers/vfio/vfio_spapr_eeh.c | 10 + + include/uapi/linux/vfio.h | 14 +- + 68 files changed, 1086 insertions(+), 696 deletions(-) + create mode 100644 arch/powerpc/include/uapi/asm/eeh.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 +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 (d41444daba1f powerpc/corenet: enable CONFIG_I2C_MUX and CONFIG_I2C_MUX_PCA954x) +$ git merge fsl/next +Already up-to-date. +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 (47ad7b9bbeaa tile: improve stack backtrace) +$ git merge tile/master +Auto-merging arch/tile/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/tile/Kconfig | 3 + + 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/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 ----------- + drivers/tty/hvc/hvc_tile.c | 3 +- + 25 files changed, 384 insertions(+), 241 deletions(-) + create mode 100644 arch/tile/include/asm/word-at-a-time.h +Merging uml/linux-next (fe205bdd1321 um: Print minimum physical memory requirement) +$ git merge uml/linux-next +Already up-to-date. +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 (4afe260bab50 CIFS: Fix race condition on RFC1002_NEGATIVE_SESSION_RESPONSE) +$ git merge cifs/for-next +Already up-to-date. +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 (bee5863ea1b4 ext4 crypto: require CONFIG_CRYPTO_CTR if ext4 encryption is enabled) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/Kconfig | 1 + + fs/ext4/crypto.c | 106 +++++----- + fs/ext4/crypto_fname.c | 502 ++++++++++++++---------------------------------- + fs/ext4/crypto_key.c | 98 +++++++--- + fs/ext4/crypto_policy.c | 83 ++++---- + fs/ext4/dir.c | 24 ++- + fs/ext4/ext4.h | 114 ++++++----- + fs/ext4/ext4_crypto.h | 51 ++--- + fs/ext4/file.c | 4 +- + fs/ext4/ialloc.c | 19 -- + fs/ext4/inline.c | 31 ++- + fs/ext4/namei.c | 340 ++++++++++++-------------------- + fs/ext4/page-io.c | 2 +- + fs/ext4/readpage.c | 10 +- + fs/ext4/super.c | 12 +- + fs/ext4/symlink.c | 16 +- + 16 files changed, 591 insertions(+), 822 deletions(-) +Merging f2fs/dev (af9f9b745b8c f2fs crypto: preallocate BIO_MAX_PAGES for writeback) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/Kconfig | 19 ++ + fs/f2fs/Makefile | 2 + + fs/f2fs/acl.c | 48 ++-- + fs/f2fs/checkpoint.c | 56 ++-- + fs/f2fs/crypto.c | 485 ++++++++++++++++++++++++++++++++++ + fs/f2fs/crypto_fname.c | 444 ++++++++++++++++++++++++++++++++ + fs/f2fs/crypto_key.c | 255 ++++++++++++++++++ + fs/f2fs/crypto_policy.c | 206 +++++++++++++++ + fs/f2fs/data.c | 615 +++++++++++++++++++++++++++++++++----------- + fs/f2fs/debug.c | 11 +- + fs/f2fs/dir.c | 194 +++++++++----- + fs/f2fs/f2fs.h | 320 +++++++++++++++++++++-- + fs/f2fs/f2fs_crypto.h | 152 +++++++++++ + fs/f2fs/file.c | 418 ++++++++++++++++++++++++++++-- + fs/f2fs/gc.c | 104 +++++++- + fs/f2fs/hash.c | 3 +- + fs/f2fs/inline.c | 43 +++- + fs/f2fs/inode.c | 9 +- + fs/f2fs/namei.c | 368 ++++++++++++++++++++------ + fs/f2fs/node.c | 48 ++-- + fs/f2fs/node.h | 22 -- + fs/f2fs/recovery.c | 21 +- + fs/f2fs/segment.c | 232 +++++++++++------ + fs/f2fs/segment.h | 1 + + fs/f2fs/super.c | 159 +++++++++--- + 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, 3689 insertions(+), 604 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 (b2ad14a37387 fuse: separate pqueue for clones) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + Documentation/ioctl/ioctl-number.txt | 1 + + 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 + + 7 files changed, 628 insertions(+), 489 deletions(-) +Merging gfs2/for-next (a3e3213676d8 gfs2: fix shadow warning in gfs2_rbm_find()) +$ git merge gfs2/for-next +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 | 2 +- + fs/gfs2/inode.c | 209 ++++++++++++++++++++++++++++++++++++++++++++++----- + fs/gfs2/ops_fstype.c | 1 + + fs/gfs2/rgrp.c | 25 +++--- + fs/gfs2/sys.c | 66 +++++++++++----- + 6 files changed, 265 insertions(+), 50 deletions(-) +Merging jfs/jfs-next (7d2ac45611b0 jfs: %pf is only for function pointers) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (feaff8e5b2cf nfs: take extra reference to fl->fl_file when running a setlk) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (fcc47efd5695 nfsd: Remove dead declarations) +$ git merge nfsd/nfsd-next +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 | 74 +++++++++++++++++++++++++ + fs/nfsd/export.c | 37 ++++++++++--- + fs/nfsd/export.h | 10 +++- + fs/nfsd/nfs3xdr.c | 14 ++--- + fs/nfsd/nfs4acl.c | 12 ----- + fs/nfsd/nfs4state.c | 5 +- + fs/nfsd/nfs4xdr.c | 33 +++++------- + fs/nfsd/nfsproc.c | 52 +++++++++++++++++- + fs/nfsd/vfs.c | 78 +++++---------------------- + fs/nfsd/vfs.h | 1 - + include/linux/fs_pin.h | 1 + + include/linux/namei.h | 1 + + include/linux/sunrpc/cache.h | 11 ++++ + 15 files changed, 221 insertions(+), 155 deletions(-) +Merging overlayfs/overlayfs-next (cc6f67bcafcb ovl: mount read-only if workdir can't be created) +$ git merge overlayfs/overlayfs-next +Already up-to-date. +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 (5ebe6afaf005 Linux 4.1-rc2) +$ git merge xfs/for-next +Already up-to-date. +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. +Auto-merging include/linux/namei.h +Removing fs/sysv/symlink.c +Auto-merging fs/namei.c +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 commit -v -a +[master 9be7f7ede9f4] 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/hppfs/hppfs.c | 13 +- + 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 +- + 86 files changed, 1221 insertions(+), 1521 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 fb71c849b0c6] Merge remote-tracking branch 'vfs/for-next' + Date: Thu May 28 13:02:38 2015 +1000 +Merging pci/next (9b08ae0dde00 Merge branch 'pci/msi' into next) +$ git merge pci/next +Merge made by the 'recursive' strategy. + drivers/ntb/ntb_hw.c | 2 -- + drivers/pci/msi.c | 53 +++++++------------------------------- + drivers/pci/pci.c | 33 ------------------------ + drivers/pci/pci.h | 21 +++++++++++++++ + drivers/pci/probe.c | 18 +++++++++++++ + drivers/pci/quirks.c | 2 -- + drivers/virtio/virtio_pci_common.c | 3 --- + include/linux/pci.h | 1 - + 8 files changed, 49 insertions(+), 84 deletions(-) +Merging hid/for-next (8ff7efa2288c Merge branch 'for-4.2/upstream' 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 | 16 +- + drivers/hid/hid-ids.h | 23 +- + drivers/hid/hid-lenovo.c | 50 +++ + drivers/hid/hid-lg.c | 24 +- + drivers/hid/hid-lg4ff.c | 458 ++++++++++++++------- + drivers/hid/hid-lg4ff.h | 4 +- + drivers/hid/hid-prodikeys.c | 3 +- + drivers/hid/hid-rmi.c | 6 +- + drivers/hid/hid-sjoy.c | 3 + + drivers/hid/hid-sony.c | 213 ++++++++-- + drivers/hid/i2c-hid/i2c-hid.c | 6 +- + 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 +- + 19 files changed, 721 insertions(+), 323 deletions(-) +Merging i2c/i2c/for-next (f6505fbabc42 i2c: add SLIMpro I2C device driver on APM X-Gene platform) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-xgene-slimpro.txt | 15 + + drivers/i2c/busses/Kconfig | 13 +- + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-imx.c | 2 +- + drivers/i2c/busses/i2c-mxs.c | 2 +- + drivers/i2c/busses/i2c-omap.c | 74 +++- + drivers/i2c/busses/i2c-rcar.c | 2 +- + 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/muxes/Kconfig | 5 +- + 12 files changed, 575 insertions(+), 13 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-xgene-slimpro.txt + create mode 100644 drivers/i2c/busses/i2c-xgene-slimpro.c +Merging jdelvare-hwmon/master (3cc49e580f0f hwmon: (w83792d) Additional PWM outputs support) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. + Documentation/hwmon/w83792d | 18 +++++++++++++----- + drivers/hwmon/w83792d.c | 27 ++++++++++++++++++++++----- + 2 files changed, 35 insertions(+), 10 deletions(-) +Merging dmi/master (9432bf142f77 firmware: dmi: List my quilt tree) +$ git merge dmi/master +Resolved 'drivers/firmware/dmi_scan.c' using previous resolution. +Auto-merging drivers/firmware/dmi_scan.c +CONFLICT (content): Merge conflict in drivers/firmware/dmi_scan.c +Auto-merging MAINTAINERS +Auto-merging Documentation/ABI/testing/sysfs-firmware-dmi-entries +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b29d54d1bcaa] Merge branch 'dmi/master' +$ git diff -M --stat --summary HEAD^.. + ...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 | 103 +++++++++++++++++++-- + include/linux/dmi.h | 2 + + 6 files changed, 128 insertions(+), 20 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 (be89ea825123 hwmon: Allow compile test of GPIO consumers if !GPIOLIB) +$ 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/max197.c | 2 +- + drivers/hwmon/ntc_thermistor.c | 53 ++++++++++++++++++++++ + drivers/hwmon/sht15.c | 2 +- + include/linux/platform_data/ntc_thermistor.h | 1 + + 7 files changed, 65 insertions(+), 8 deletions(-) +Merging v4l-dvb/master (e7f8fd8aa7f2 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/v4l/controls.xml | 4 +- + .../DocBook/media/v4l/media-func-open.xml | 2 +- + Documentation/DocBook/media/v4l/vidioc-g-edid.xml | 7 + + .../devicetree/bindings/media/i2c/adp1653.txt | 37 + + Documentation/video4linux/v4l2-pci-skeleton.c | 2 - + MAINTAINERS | 8 + + drivers/input/touchscreen/Kconfig | 3 +- + drivers/media/dvb-frontends/af9013.c | 4 + + drivers/media/dvb-frontends/bcm3510.c | 4 +- + drivers/media/dvb-frontends/cx24116.c | 8 +- + drivers/media/dvb-frontends/cx24117.c | 2 +- + drivers/media/dvb-frontends/cx24123.h | 2 +- + drivers/media/dvb-frontends/dib0070.c | 575 ++++++------ + drivers/media/dvb-frontends/dib3000mc.c | 18 +- + drivers/media/dvb-frontends/dib8000.h | 2 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 38 +- + drivers/media/dvb-frontends/lgdt3306a.c | 2 +- + drivers/media/dvb-frontends/mb86a20s.h | 2 +- + drivers/media/dvb-frontends/s5h1420.c | 20 +- + drivers/media/dvb-frontends/s921.h | 2 +- + drivers/media/dvb-frontends/stv0288.c | 28 +- + drivers/media/dvb-frontends/stv0297.c | 8 +- + drivers/media/dvb-frontends/stv0900_sw.c | 6 +- + drivers/media/dvb-frontends/tda1004x.c | 2 +- + drivers/media/dvb-frontends/tda10086.c | 4 +- + drivers/media/dvb-frontends/zl10353.c | 10 +- + 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/adv7604.c | 69 +- + drivers/media/i2c/adv7842.c | 25 +- + 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 | 2 +- + drivers/media/i2c/ov7670.c | 65 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +- + drivers/media/i2c/s5k5baf.c | 2 +- + 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/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 | 1 + + drivers/media/pci/Makefile | 1 + + drivers/media/pci/bt8xx/bttv-audio-hook.c | 443 ++++++---- + drivers/media/pci/bt8xx/bttv-driver.c | 5 +- + 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-video.c | 12 +- + drivers/media/pci/cx88/cx88-core.c | 2 + + 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 | 1 - + 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-ioctl.c | 12 +- + drivers/media/pci/mantis/mantis_cards.c | 3 - + drivers/media/pci/ngene/ngene-core.c | 10 +- + drivers/media/pci/saa7134/saa7134-cards.c | 19 +- + drivers/media/pci/saa7134/saa7134-dvb.c | 2 +- + drivers/media/pci/saa7134/saa7134-empress.c | 32 +- + drivers/media/pci/saa7164/saa7164-api.c | 22 +- + 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 | 16 +- + drivers/media/pci/saa7164/saa7164-dvb.c | 238 ++++- + 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 | 7 +- + drivers/media/pci/zoran/zoran_device.c | 13 +- + drivers/media/platform/am437x/am437x-vpfe.c | 32 +- + drivers/media/platform/blackfin/bfin_capture.c | 40 +- + drivers/media/platform/davinci/vpfe_capture.c | 19 +- + drivers/media/platform/m2m-deinterlace.c | 1 - + drivers/media/platform/marvell-ccic/cafe-driver.c | 13 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 471 ++++------ + drivers/media/platform/marvell-ccic/mcam-core.h | 3 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 1 + + drivers/media/platform/s3c-camif/camif-capture.c | 13 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 2 - + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 2 +- + drivers/media/platform/s5p-tv/hdmi_drv.c | 12 +- + drivers/media/platform/s5p-tv/mixer_drv.c | 15 +- + drivers/media/platform/s5p-tv/sdo_drv.c | 14 +- + drivers/media/platform/sh_vou.c | 61 +- + 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 | 109 ++- + .../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/via-camera.c | 19 +- + drivers/media/platform/vim2m.c | 4 - + drivers/media/platform/vivid/vivid-core.c | 13 +- + drivers/media/platform/vivid/vivid-core.h | 1 - + drivers/media/platform/vivid/vivid-radio-rx.c | 2 + + drivers/media/platform/vivid/vivid-tpg.c | 109 ++- + drivers/media/platform/vivid/vivid-tpg.h | 1 + + drivers/media/platform/vivid/vivid-vid-cap.c | 17 +- + drivers/media/platform/vivid/vivid-vid-common.c | 50 -- + drivers/media/platform/vivid/vivid-vid-out.c | 3 +- + drivers/media/platform/xilinx/Kconfig | 2 +- + drivers/media/radio/radio-si476x.c | 4 +- + drivers/media/radio/radio-timb.c | 4 +- + drivers/media/radio/si4713/si4713.c | 4 +- + drivers/media/radio/wl128x/fmdrv.h | 2 +- + drivers/media/rc/ir-sony-decoder.c | 28 +- + drivers/media/rc/rc-main.c | 2 +- + drivers/media/rc/redrat3.c | 2 +- + drivers/media/tuners/qt1010.c | 8 +- + drivers/media/tuners/r820t.c | 4 +- + drivers/media/usb/as102/as102_drv.c | 1 + + drivers/media/usb/cx231xx/cx231xx-417.c | 18 +- + drivers/media/usb/cx231xx/cx231xx-avcore.c | 44 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 30 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 23 +- + drivers/media/usb/dvb-usb/af9005-fe.c | 2 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 32 +- + drivers/media/usb/dvb-usb/dw2102.c | 2 +- + drivers/media/usb/dvb-usb/vp702x.c | 7 +- + drivers/media/usb/em28xx/em28xx-camera.c | 12 +- + 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/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/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/ttusb-dec/ttusb_dec.c | 4 +- + drivers/media/usb/usbtv/usbtv-video.c | 12 +- + drivers/media/usb/usbvision/usbvision-core.c | 4 +- + drivers/media/v4l2-core/Kconfig | 2 +- + drivers/media/v4l2-core/v4l2-dv-timings.c | 29 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 199 ++++- + drivers/media/v4l2-core/v4l2-of.c | 92 +- + drivers/media/v4l2-core/videobuf2-core.c | 2 - + drivers/media/v4l2-core/videobuf2-dma-contig.c | 7 + + drivers/media/v4l2-core/videobuf2-dma-sg.c | 6 + + drivers/media/v4l2-core/videobuf2-vmalloc.c | 6 +- + drivers/staging/media/Kconfig | 2 - + drivers/staging/media/Makefile | 1 - + drivers/staging/media/bcm2048/radio-bcm2048.c | 3 +- + drivers/staging/media/dt3155v4l/Kconfig | 29 - + drivers/staging/media/dt3155v4l/Makefile | 1 - + drivers/staging/media/dt3155v4l/dt3155v4l.c | 981 --------------------- + include/media/adp1653.h | 8 +- + include/media/v4l2-of.h | 20 +- + include/media/v4l2-subdev.h | 16 - + 196 files changed, 4424 insertions(+), 3448 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/adp1653.txt + 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%) + 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 (653ac63df358 Merge branch 'kbuild/misc' 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 | 2 +- + scripts/coccinelle/misc/returnvar.cocci | 2 +- + scripts/coccinelle/misc/semicolon.cocci | 2 +- + scripts/link-vmlinux.sh | 20 +++- + scripts/package/builddeb | 31 ++++-- + scripts/package/mkspec | 4 +- + 18 files changed, 470 insertions(+), 38 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 (e5802d2554ff Merge branch 'for-4.1-fixes' 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/brcm,sata-brcmstb.txt | 34 +++ + Documentation/kernel-parameters.txt | 2 + + drivers/ata/Kconfig | 9 + + drivers/ata/Makefile | 1 + + drivers/ata/ahci.h | 2 + + drivers/ata/ahci_brcmstb.c | 322 +++++++++++++++++++++ + drivers/ata/ahci_mvebu.c | 2 +- + drivers/ata/ahci_xgene.c | 103 +++++-- + drivers/ata/libahci.c | 89 ++++-- + drivers/ata/libata-core.c | 2 + + 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_nv.c | 2 +- + include/linux/ata.h | 12 +- + include/linux/libata.h | 1 + + 18 files changed, 587 insertions(+), 46 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/brcm,sata-brcmstb.txt + create mode 100644 drivers/ata/ahci_brcmstb.c +Merging pm/linux-next (701401b85342 Merge branch 'pnp' into linux-next) +$ git merge pm/linux-next +Auto-merging drivers/cpufreq/Kconfig.arm +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 +- + arch/ia64/pci/pci.c | 13 +- + arch/x86/pci/acpi.c | 13 +- + 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 | 34 +++- + 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 | 52 ++++++ + 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 +- + 82 files changed, 2016 insertions(+), 811 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. + arch/x86/include/uapi/asm/msr-index.h | 1 + + drivers/idle/intel_idle.c | 3 +- + tools/power/x86/turbostat/turbostat.c | 224 ++++++++++++++++++++++++++++------ + 3 files changed, 187 insertions(+), 41 deletions(-) +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 (bcacb3e5fd10 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/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 | 83 ++- + drivers/acpi/thermal.c | 9 +- + drivers/platform/x86/acerhdf.c | 3 +- + drivers/thermal/Kconfig | 36 ++ + drivers/thermal/Makefile | 2 + + drivers/thermal/cpu_cooling.c | 585 ++++++++++++++++++++- + drivers/thermal/db8500_thermal.c | 2 +- + drivers/thermal/fair_share.c | 41 +- + drivers/thermal/imx_thermal.c | 3 +- + drivers/thermal/of-thermal.c | 15 +- + 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 | 310 ++++++++++- + 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 | 86 ++- + include/trace/events/thermal.h | 58 ++ + include/trace/events/thermal_power_allocator.h | 87 +++ + 27 files changed, 2851 insertions(+), 135 deletions(-) + 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/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 (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (a847a6d25f6d Merge branch 'topic/pxa' 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 + + .../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 | 7 + + drivers/dma/ep93xx_dma.c | 2 +- + drivers/dma/imx-dma.c | 2 +- + drivers/dma/imx-sdma.c | 2 +- + 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 | 7 +- + 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/sun6i-dma.c | 12 + + drivers/dma/ti-dma-crossbar.c | 188 +++ + 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 - + 28 files changed, 2469 insertions(+), 105 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 (ed2dfd900992 tcp/dccp: warn user for preferred ip_local_port_range) +$ git merge net-next/master +Resolved 'drivers/net/wireless/iwlwifi/Kconfig' using previous resolution. +Removing samples/pktgen/pktgen.conf-2-2 +Removing samples/pktgen/pktgen.conf-2-1 +Removing samples/pktgen/pktgen.conf-1-1 +Auto-merging net/unix/af_unix.c +Auto-merging net/sched/sch_api.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/key.h +Auto-merging net/mac80211/key.c +Auto-merging net/mac80211/iface.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/mac80211/cfg.c +Auto-merging net/ipv4/geneve_core.c +Auto-merging net/caif/caif_socket.c +Removing include/net/flow_keys.h +Auto-merging drivers/net/wireless/iwlwifi/pcie/trans.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/rs.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/ops.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/d3.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-nvm-parse.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-7000.c +Auto-merging drivers/net/wireless/iwlwifi/Kconfig +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/Kconfig +CONFLICT (modify/delete): drivers/net/phy/amd-xgbe-phy.c deleted in net-next/master and modified in HEAD. Version HEAD of drivers/net/phy/amd-xgbe-phy.c left in tree. +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac.h +Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/net/amd-xgbe-phy.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/net/phy/amd-xgbe-phy.c +drivers/net/phy/amd-xgbe-phy.c: needs merge +rm 'drivers/net/phy/amd-xgbe-phy.c' +$ git commit -v -a +[master 65881191cb67] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + .../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 +- + Documentation/devicetree/bindings/net/macb.txt | 1 + + .../devicetree/bindings/net/nxp,lpc1850-dwmac.txt | 20 + + Documentation/devicetree/bindings/net/phy.txt | 3 + + Documentation/networking/bonding.txt | 84 + + Documentation/networking/can.txt | 3 + + Documentation/networking/dctcp.txt | 1 + + Documentation/networking/ip-sysctl.txt | 25 +- + Documentation/networking/pktgen.txt | 150 +- + Documentation/networking/switchdev.txt | 417 ++- + Documentation/networking/tc-actions-env-rules.txt | 6 - + Documentation/s390/qeth.txt | 4 +- + MAINTAINERS | 8 +- + arch/arm/net/bpf_jit_32.c | 10 + + arch/x86/net/bpf_jit_comp.c | 150 +- + crypto/af_alg.c | 4 +- + drivers/atm/he.c | 2 +- + drivers/bcma/driver_gpio.c | 20 +- + drivers/block/drbd/drbd_receiver.c | 4 +- + drivers/infiniband/hw/mlx4/alias_GUID.c | 7 +- + drivers/infiniband/hw/mlx4/mad.c | 11 +- + 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 | 56 +- + 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 | 636 ++++- + 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 | 63 + + drivers/net/ethernet/broadcom/bcmsysport.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- + 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 | 414 +++ + drivers/net/ethernet/cavium/thunder/nic_main.c | 940 +++++++ + drivers/net/ethernet/cavium/thunder/nic_reg.h | 213 ++ + .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 601 ++++ + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 1332 +++++++++ + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 1544 ++++++++++ + 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 | 223 ++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 81 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 58 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 18 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 378 ++- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/sge.c | 351 +-- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 1059 ++++--- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 34 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 83 +- + drivers/net/ethernet/chelsio/cxgb4/t4_values.h | 23 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 10 + + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 13 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 92 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 10 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 12 +- + drivers/net/ethernet/cisco/enic/enic_clsf.c | 31 +- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 10 +- + 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/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 | 2 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 19 +- + drivers/net/ethernet/intel/e1000e/82571.c | 2 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 23 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 32 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 - + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 - + drivers/net/ethernet/intel/igb/igb_main.c | 38 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 10 +- + 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/mvneta.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 21 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 24 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 12 - + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 12 +- + drivers/net/ethernet/moxa/moxart_ether.c | 1 - + drivers/net/ethernet/neterion/s2io.c | 6 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 4 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 46 +- + drivers/net/ethernet/rocker/rocker.c | 1515 ++++++---- + 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 | 617 +++- + drivers/net/ethernet/sfc/ef10_sriov.c | 738 +++++ + drivers/net/ethernet/sfc/ef10_sriov.h | 64 + + drivers/net/ethernet/sfc/efx.c | 308 +- + 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 | 404 ++- + drivers/net/ethernet/sfc/mcdi_port.c | 1 + + drivers/net/ethernet/sfc/net_driver.h | 32 +- + drivers/net/ethernet/sfc/nic.h | 134 +- + 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 | 72 + + drivers/net/ethernet/sfc/sriov.h | 29 + + drivers/net/ethernet/stmicro/stmmac/Kconfig | 76 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 13 +- + .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 41 + + .../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 | 34 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 19 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 111 +- + .../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 | 4 +- + 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/geneve.c | 503 ++++ + drivers/net/hyperv/hyperv_net.h | 9 + + drivers/net/hyperv/netvsc.c | 43 +- + drivers/net/hyperv/netvsc_drv.c | 93 +- + 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 | 7 - + drivers/net/phy/Makefile | 1 - + drivers/net/phy/amd-xgbe-phy.c | 1901 ------------- + 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/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/wireless/adm8211.c | 7 +- + 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 | 161 +- + drivers/net/wireless/ath/ath10k/core.h | 48 +- + drivers/net/wireless/ath/ath10k/debug.c | 127 +- + 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 | 194 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 34 +- + drivers/net/wireless/ath/ath10k/hw.h | 53 +- + drivers/net/wireless/ath/ath10k/mac.c | 2824 ++++++++++++++----- + 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 | 101 +- + drivers/net/wireless/ath/ath10k/rx_desc.h | 22 + + 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 | 272 +- + 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/ath9k/common-spectral.c | 740 ++++- + drivers/net/wireless/ath/ath9k/common-spectral.h | 35 +- + 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/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/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/b43/main.c | 8 +- + drivers/net/wireless/b43legacy/main.c | 8 +- + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 18 +- + drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 202 +- + drivers/net/wireless/brcm80211/brcmfmac/chip.c | 1 + + drivers/net/wireless/brcm80211/brcmfmac/feature.c | 1 + + drivers/net/wireless/brcm80211/brcmfmac/feature.h | 4 + + drivers/net/wireless/brcm80211/brcmfmac/firmware.c | 189 +- + drivers/net/wireless/brcm80211/brcmfmac/firmware.h | 6 + + drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 27 +- + 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/dvm/mac80211.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-7000.c | 23 + + drivers/net/wireless/iwlwifi/iwl-config.h | 44 + + drivers/net/wireless/iwlwifi/iwl-fw-file.h | 8 +- + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 3 + + drivers/net/wireless/iwlwifi/mvm/d3.c | 7 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 56 +- + drivers/net/wireless/iwlwifi/mvm/fw-api.h | 7 - + drivers/net/wireless/iwlwifi/mvm/fw.c | 15 - + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 157 +- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 109 +- + drivers/net/wireless/iwlwifi/mvm/ops.c | 3 - + drivers/net/wireless/iwlwifi/mvm/rs.c | 20 +- + drivers/net/wireless/iwlwifi/mvm/rs.h | 2 - + drivers/net/wireless/iwlwifi/mvm/scan.c | 988 ++++--- + drivers/net/wireless/iwlwifi/mvm/tt.c | 40 +- + drivers/net/wireless/iwlwifi/pcie/trans.c | 77 +- + drivers/net/wireless/libertas_tf/main.c | 7 +- + drivers/net/wireless/mac80211_hwsim.c | 55 +- + drivers/net/wireless/mwifiex/join.c | 12 +- + drivers/net/wireless/mwifiex/main.c | 11 +- + drivers/net/wireless/mwifiex/sta_ioctl.c | 2 + + drivers/net/wireless/mwifiex/tdls.c | 2 +- + drivers/net/wireless/mwifiex/uap_cmd.c | 2 +- + drivers/net/wireless/mwifiex/util.c | 7 +- + drivers/net/wireless/mwifiex/wmm.c | 9 + + 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/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/core.h | 3 +- + drivers/net/wireless/rtlwifi/rtl8192ee/fw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8723be/fw.c | 2 +- + 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/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/qla4xxx/ql4_def.h | 1 + + drivers/staging/vt6655/device_main.c | 11 +- + drivers/staging/vt6656/main_usb.c | 11 +- + fs/afs/rxrpc.c | 2 +- + fs/dlm/lowcomms.c | 16 +- + fs/splice.c | 1 + + include/linux/bpf.h | 22 + + 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 | 2 +- + include/linux/igmp.h | 1 + + include/linux/mdio-gpio.h | 3 +- + include/linux/mm_types.h | 18 + + include/linux/net.h | 3 +- + include/linux/netdev_features.h | 5 +- + include/linux/netdevice.h | 26 +- + 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/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 | 4 +- + include/net/checksum.h | 4 +- + include/net/codel.h | 12 +- + include/net/dst.h | 18 - + include/net/flow_dissector.h | 167 ++ + include/net/flow_keys.h | 45 - + include/net/geneve.h | 5 + + include/net/inet_common.h | 2 +- + include/net/inet_frag.h | 2 +- + include/net/inet_hashtables.h | 49 +- + include/net/ip.h | 26 +- + include/net/ip6_fib.h | 45 +- + include/net/ip6_route.h | 21 +- + include/net/ipv6.h | 24 +- + include/net/llc_conn.h | 2 +- + include/net/mac80211.h | 161 +- + include/net/net_namespace.h | 3 + + include/net/netns/ipv4.h | 3 + + include/net/netns/ipv6.h | 1 + + 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 | 79 +- + include/uapi/linux/bpf.h | 10 + + include/uapi/linux/can.h | 6 + + include/uapi/linux/ethtool.h | 6 +- + include/uapi/linux/if_link.h | 12 + + include/uapi/linux/if_packet.h | 7 + + include/uapi/linux/ipv6_route.h | 1 + + include/uapi/linux/netfilter.h | 6 + + include/uapi/linux/netlink.h | 1 + + include/uapi/linux/nl80211.h | 28 +- + include/uapi/linux/pkt_cls.h | 57 +- + include/uapi/linux/pkt_sched.h | 7 +- + include/uapi/linux/snmp.h | 2 + + include/uapi/linux/tcp.h | 6 +- + kernel/bpf/arraymap.c | 113 +- + kernel/bpf/core.c | 73 +- + kernel/bpf/syscall.c | 23 +- + kernel/bpf/verifier.c | 17 + + kernel/seccomp.c | 70 +- + kernel/trace/bpf_trace.c | 2 + + lib/rhashtable.c | 8 +- + lib/test_bpf.c | 2972 ++++++++++++++++++-- + lib/test_rhashtable.c | 215 +- + mm/page_alloc.c | 98 + + 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/bluetooth/6lowpan.c | 2 +- + net/bluetooth/bnep/sock.c | 2 +- + net/bluetooth/cmtp/sock.c | 2 +- + net/bluetooth/hci_sock.c | 2 +- + net/bluetooth/hidp/sock.c | 2 +- + net/bluetooth/l2cap_sock.c | 10 +- + net/bluetooth/rfcomm/core.c | 2 +- + net/bluetooth/rfcomm/sock.c | 8 +- + net/bluetooth/sco.c | 8 +- + 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 | 212 +- + net/core/ethtool.c | 1 - + net/core/filter.c | 85 +- + net/core/flow_dissector.c | 428 +-- + net/core/neighbour.c | 3 + + net/core/net-sysfs.c | 10 +- + net/core/net_namespace.c | 133 +- + 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 | 14 +- + net/ieee802154/socket.c | 2 +- + net/ipv4/Kconfig | 4 +- + net/ipv4/Makefile | 2 +- + net/ipv4/af_inet.c | 8 +- + net/ipv4/fib_semantics.c | 4 - + net/ipv4/fib_trie.c | 41 +- + 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_tunnel_core.c | 20 +- + net/ipv4/ipip.c | 3 +- + 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/sysctl_net_ipv4.c | 15 +- + net/ipv4/tcp.c | 89 +- + net/ipv4/tcp_input.c | 124 +- + net/ipv4/tcp_ipv4.c | 7 +- + net/ipv4/tcp_minisocks.c | 4 + + net/ipv4/tcp_output.c | 53 +- + 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 | 3 +- + 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/output_core.c | 13 +- + net/ipv6/raw.c | 3 + + net/ipv6/route.c | 561 ++-- + net/ipv6/sysctl_net_ipv6.c | 8 + + net/ipv6/tcp_ipv6.c | 6 +- + 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 | 117 +- + 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 | 15 +- + net/mac80211/mesh_plink.c | 37 +- + net/mac80211/mlme.c | 57 +- + 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 | 27 +- + net/mac80211/trace.h | 42 +- + net/mac80211/tx.c | 528 +++- + net/netfilter/Kconfig | 7 + + 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/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/datapath.c | 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 | 2 +- + 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_mirred.c | 2 +- + net/sched/act_pedit.c | 5 +- + net/sched/cls_flow.c | 22 +- + net/sched/cls_flower.c | 688 +++++ + 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 | 827 +++++- + 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 | 3 +- + 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/nl80211.c | 7 +- + net/wireless/reg.c | 4 +- + net/x25/af_x25.c | 8 +- + net/xfrm/xfrm_output.c | 12 + + samples/bpf/Makefile | 10 +- + samples/bpf/bpf_helpers.h | 4 + + samples/bpf/bpf_load.c | 57 +- + samples/bpf/sockex3_kern.c | 303 ++ + samples/bpf/sockex3_user.c | 66 + + 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 +- + 665 files changed, 38687 insertions(+), 13324 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/nxp,lpc1850-dwmac.txt + 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/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-lpc18xx.c + create mode 100644 drivers/net/geneve.c + delete mode 100644 drivers/net/phy/amd-xgbe-phy.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 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/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 (8faf491e6420 xfrm: optimise to search the inexact policy list) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_state.c +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_input.c | 12 ++++++------ + net/xfrm/xfrm_policy.c | 42 ++++++++++++++++++++---------------------- + net/xfrm/xfrm_state.c | 4 ++-- + 3 files changed, 28 insertions(+), 30 deletions(-) +Merging wireless-drivers-next/master (f3550aeb7fcd brcmfmac: add support for dma indices feature) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/adm8211.c | 20 +- + drivers/net/wireless/ath/ath10k/core.c | 4 +- + drivers/net/wireless/ath/ath10k/core.h | 8 + + drivers/net/wireless/ath/ath10k/debug.h | 1 + + drivers/net/wireless/ath/ath10k/htt_rx.c | 14 +- + drivers/net/wireless/ath/ath10k/mac.c | 9 +- + drivers/net/wireless/ath/ath10k/pci.c | 317 ++++++++---- + drivers/net/wireless/ath/ath10k/pci.h | 95 ++-- + drivers/net/wireless/ath/ath10k/spectral.c | 5 +- + drivers/net/wireless/ath/ath10k/wmi.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/htc.h | 6 +- + drivers/net/wireless/ath/ath9k/hw.h | 2 + + drivers/net/wireless/ath/carl9170/usb.c | 5 +- + 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 | 29 +- + 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/brcm80211/brcmfmac/bcmsdh.c | 9 + + .../net/wireless/brcm80211/brcmfmac/commonring.c | 18 - + 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 | 157 ++++-- + 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/cfg80211.c | 462 +++++++++-------- + drivers/net/wireless/mwifiex/cfp.c | 50 +- + drivers/net/wireless/mwifiex/cmdevt.c | 361 ++++++++------ + drivers/net/wireless/mwifiex/debugfs.c | 145 +++++- + drivers/net/wireless/mwifiex/ethtool.c | 6 +- + drivers/net/wireless/mwifiex/fw.h | 9 + + drivers/net/wireless/mwifiex/init.c | 53 +- + drivers/net/wireless/mwifiex/ioctl.h | 6 + + drivers/net/wireless/mwifiex/join.c | 208 ++++---- + drivers/net/wireless/mwifiex/main.c | 114 +++-- + drivers/net/wireless/mwifiex/main.h | 50 ++ + drivers/net/wireless/mwifiex/pcie.c | 552 +++++++++++---------- + drivers/net/wireless/mwifiex/scan.c | 377 +++++++------- + drivers/net/wireless/mwifiex/sdio.c | 424 +++++++++------- + drivers/net/wireless/mwifiex/sta_cmd.c | 159 +++--- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 197 ++++---- + drivers/net/wireless/mwifiex/sta_event.c | 130 ++--- + drivers/net/wireless/mwifiex/sta_ioctl.c | 145 +++--- + 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 | 20 +- + 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 | 27 +- + drivers/net/wireless/mwifiex/wmm.c | 98 ++-- + drivers/net/wireless/rndis_wlan.c | 6 +- + drivers/net/wireless/rtlwifi/Kconfig | 2 +- + .../wireless/rtlwifi/btcoexist/halbtc8723b2ant.c | 7 +- + 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/hw.c | 21 +- + drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 13 - + drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 21 +- + drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 24 +- + include/linux/bcma/bcma.h | 9 + + 84 files changed, 3761 insertions(+), 2406 deletions(-) + create mode 100644 drivers/net/wireless/ath/wil6210/pmc.c + create mode 100644 drivers/net/wireless/ath/wil6210/pmc.h +$ git am -3 ../patches/0001-brcmfmac-fix-invalid-access-to-struct-acpi_device-fi.patch +Applying: brcmfmac: fix invalid access to struct acpi_device fields +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +$ git add -A . +$ git commit -v -a --amend +[master dc1cd977697f] Merge remote-tracking branch 'wireless-drivers-next/master' + Date: Thu May 28 14:34:16 2015 +1000 +Merging bluetooth/master (b5a61c306b0d atusb: add support for at86rf230) +$ git merge bluetooth/master +Auto-merging net/bluetooth/hci_core.c +Auto-merging drivers/bluetooth/btusb.c +Merge made by the 'recursive' strategy. + Documentation/networking/ieee802154.txt | 32 +- + 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/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 +- + include/net/cfg802154.h | 70 +++- + include/net/ieee802154_netdev.h | 16 - + include/net/mac802154.h | 38 +- + include/net/nl802154.h | 79 ++++ + net/bluetooth/hci_core.c | 5 - + net/bluetooth/mgmt.c | 6 +- + net/bluetooth/smp.c | 20 +- + 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 | 20 +- + net/ieee802154/trace.h | 32 +- + 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 +- + 46 files changed, 2374 insertions(+), 1133 deletions(-) + create mode 100644 drivers/bluetooth/btrtl.c + create mode 100644 drivers/bluetooth/btrtl.h + create mode 100644 drivers/net/ieee802154/at86rf230.h + create mode 100644 drivers/net/ieee802154/atusb.c + create mode 100644 drivers/net/ieee802154/atusb.h +Merging infiniband/for-next (c1c2fef6cfb0 Merge branches 'cve-fixup', 'ipoib', 'iser', 'misc-4.1', 'or-mlx4' and 'srp' into for-4.1) +$ git merge infiniband/for-next +Already up-to-date. +Merging rdma/for-next (175e8efe6997 Merge branches 'bart-srp', 'generic-errors', 'ira-cleanups' and 'mwang-v8' into k.o/for-4.2) +$ git merge rdma/for-next +Auto-merging net/rds/af_rds.c +Auto-merging drivers/infiniband/core/cma.c +Auto-merging drivers/infiniband/core/cm.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/agent.c | 2 +- + drivers/infiniband/core/cache.c | 61 +++--- + drivers/infiniband/core/cm.c | 20 +- + drivers/infiniband/core/cma.c | 285 ++++++++++++------------- + 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 | 71 ++++++- + drivers/infiniband/hw/amso1100/c2_provider.c | 18 ++ + drivers/infiniband/hw/cxgb3/iwch_provider.c | 18 ++ + drivers/infiniband/hw/cxgb4/provider.c | 18 ++ + drivers/infiniband/hw/ehca/ehca_iverbs.h | 3 + + drivers/infiniband/hw/ehca/ehca_main.c | 18 ++ + drivers/infiniband/hw/ipath/ipath_verbs.c | 18 ++ + drivers/infiniband/hw/mlx4/main.c | 22 ++ + drivers/infiniband/hw/mlx5/main.c | 18 ++ + drivers/infiniband/hw/mthca/mthca_provider.c | 18 ++ + drivers/infiniband/hw/nes/nes_verbs.c | 18 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 18 ++ + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 3 + + drivers/infiniband/hw/qib/qib_verbs.c | 18 ++ + 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 | 15 +- + 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/scsi/ibmvscsi/ibmvscsi.c | 6 +- + drivers/scsi/scsi_transport_srp.c | 67 +++--- + include/rdma/ib_mad.h | 4 +- + include/rdma/ib_verbs.h | 301 ++++++++++++++++++++++++++- + 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 | 38 +--- + net/rds/rdma_transport.c | 34 +-- + net/rds/rds.h | 1 - + 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 +------- + 52 files changed, 1111 insertions(+), 745 deletions(-) +Merging mtd/master (e26081808eda Linux 4.1-rc4) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (636fdbf88efe mtd: cfi_cmdset_0002: Initialize datum before calling map_word_load_partial) +$ 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/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/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 +- + 42 files changed, 3279 insertions(+), 371 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 (d725332208ef crypto: ccp - Remove unused structure field) +$ git merge crypto/master +Auto-merging net/mac802154/llsec.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging drivers/crypto/n2_core.c +Auto-merging drivers/crypto/Kconfig +Auto-merging crypto/algif_aead.c +Auto-merging crypto/Kconfig +Removing arch/arm/crypto/sha512_neon_glue.c +Removing arch/arm/crypto/sha512-armv7-neon.S +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/DocBook/crypto-API.tmpl | 40 +- + .../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/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 | 5 +- + arch/x86/crypto/sha-mb/sha1_mb.c | 3 +- + crypto/842.c | 174 +- + crypto/Kconfig | 28 +- + crypto/Makefile | 3 + + crypto/ablkcipher.c | 10 +- + crypto/aead.c | 451 +++-- + crypto/algapi.c | 30 +- + crypto/algif_aead.c | 1 + + 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/cryptd.c | 63 +- + crypto/crypto_null.c | 39 + + crypto/drbg.c | 513 +++--- + crypto/echainiv.c | 546 ++++++ + crypto/fips.c | 53 +- + crypto/gcm.c | 45 +- + crypto/internal.h | 3 +- + crypto/jitterentropy.c | 909 ++++++++++ + crypto/krng.c | 33 +- + crypto/md5.c | 8 +- + crypto/pcompress.c | 7 +- + crypto/pcrypt.c | 86 +- + crypto/proc.c | 41 - + crypto/rng.c | 105 +- + crypto/scatterwalk.c | 38 +- + crypto/seqiv.c | 626 ++++++- + crypto/shash.c | 7 +- + crypto/tcrypt.c | 9 +- + crypto/testmgr.c | 15 + + crypto/testmgr.h | 501 +++++- + crypto/zlib.c | 4 +- + drivers/char/random.c | 14 +- + drivers/crypto/Kconfig | 28 +- + drivers/crypto/caam/caamalg.c | 102 +- + drivers/crypto/caam/compat.h | 2 +- + drivers/crypto/ccp/ccp-ops.c | 2 - + 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 | 6 + + drivers/crypto/nx/nx-842-crypto.c | 579 ++++++ + drivers/crypto/nx/nx-842-powernv.c | 625 +++++++ + drivers/crypto/nx/nx-842-pseries.c | 1128 ++++++++++++ + drivers/crypto/nx/nx-842.c | 1623 ++--------------- + drivers/crypto/nx/nx-842.h | 131 ++ + 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 | 7 +- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 3 +- + 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 | 511 +++++- + include/crypto/algapi.h | 35 +- + include/crypto/compress.h | 8 +- + include/crypto/cryptd.h | 1 + + include/crypto/drbg.h | 59 +- + include/crypto/internal/aead.h | 88 +- + 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 | 490 +----- + include/linux/module.h | 12 + + include/linux/nx842.h | 21 +- + include/linux/random.h | 1 + + include/linux/sw842.h | 12 + + 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 + + net/mac80211/aes_ccm.c | 3 +- + net/mac80211/aes_gcm.c | 3 +- + net/mac80211/aes_gmac.c | 2 +- + net/mac802154/llsec.c | 3 +- + 116 files changed, 12079 insertions(+), 4348 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/echainiv.c + create mode 100644 crypto/jitterentropy.c + create mode 100644 drivers/crypto/nx/nx-842-crypto.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/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 (c6e7e4bb7ff9 Merge branch 'drm/next/adv7511' of git://linuxtv.org/pinchartl/fbdev into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 4 +- + MAINTAINERS | 2 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/gpu/drm/Makefile | 2 - + drivers/gpu/drm/amd/amdkfd/Makefile | 1 + + 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 | 87 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 52 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 33 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 21 +- + .../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_priv.h | 75 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 27 +- + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 2 + + 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 | 134 +- + drivers/gpu/drm/drm_atomic_helper.c | 43 +- + drivers/gpu/drm/drm_auth.c | 178 +- + drivers/gpu/drm/drm_crtc.c | 348 ++- + drivers/gpu/drm/drm_crtc_helper.c | 7 +- + 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 | 7 +- + drivers/gpu/drm/drm_internal.h | 1 - + drivers/gpu/drm/drm_irq.c | 102 +- + 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 | 26 +- + 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 | 700 ++++- + drivers/gpu/drm/i915/i915_dma.c | 281 +- + drivers/gpu/drm/i915/i915_drv.c | 104 +- + drivers/gpu/drm/i915/i915_drv.h | 207 +- + drivers/gpu/drm/i915/i915_gem.c | 410 +-- + 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 | 37 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 80 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 1111 ++++---- + 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 | 4 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 11 +- + drivers/gpu/drm/i915/i915_irq.c | 282 +- + drivers/gpu/drm/i915/i915_params.c | 8 + + drivers/gpu/drm/i915/i915_reg.h | 578 +++- + 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 | 39 +- + drivers/gpu/drm/i915/intel_bios.h | 4 +- + drivers/gpu/drm/i915/intel_crt.c | 2 +- + drivers/gpu/drm/i915/intel_csr.c | 414 +++ + drivers/gpu/drm/i915/intel_ddi.c | 864 ++++-- + drivers/gpu/drm/i915/intel_display.c | 2941 ++++++++++++-------- + drivers/gpu/drm/i915/intel_dp.c | 366 ++- + drivers/gpu/drm/i915/intel_dp_mst.c | 27 +- + drivers/gpu/drm/i915/intel_drv.h | 141 +- + drivers/gpu/drm/i915/intel_dvo.c | 27 +- + drivers/gpu/drm/i915/intel_fbc.c | 2 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 2 + + drivers/gpu/drm/i915/intel_hdmi.c | 76 +- + drivers/gpu/drm/i915/intel_i2c.c | 97 +- + drivers/gpu/drm/i915/intel_lrc.c | 509 ++-- + drivers/gpu/drm/i915/intel_lrc.h | 5 +- + drivers/gpu/drm/i915/intel_lvds.c | 4 +- + drivers/gpu/drm/i915/intel_overlay.c | 66 +- + drivers/gpu/drm/i915/intel_panel.c | 87 +- + drivers/gpu/drm/i915/intel_pm.c | 134 +- + drivers/gpu/drm/i915/intel_psr.c | 118 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 188 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 10 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 372 ++- + drivers/gpu/drm/i915/intel_sdvo.c | 11 +- + drivers/gpu/drm/i915/intel_sprite.c | 318 +-- + drivers/gpu/drm/i915/intel_uncore.c | 98 +- + drivers/gpu/drm/qxl/qxl_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_fb.c | 275 +- + drivers/gpu/drm/radeon/cik_reg.h | 2 + + drivers/gpu/drm/radeon/cikd.h | 1 + + drivers/gpu/drm/radeon/radeon_kfd.c | 21 +- + 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 +- + include/drm/drmP.h | 14 +- + include/drm/drm_atomic.h | 55 + + include/drm/drm_atomic_helper.h | 4 + + include/drm/drm_crtc.h | 36 +- + include/drm/drm_dp_helper.h | 6 +- + include/drm/i915_pciids.h | 6 + + include/uapi/drm/i915_drm.h | 1 + + include/uapi/linux/kfd_ioctl.h | 96 +- + 120 files changed, 11149 insertions(+), 4713 deletions(-) + 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_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/i915/i915_gem_batch_pool.h + create mode 100644 drivers/gpu/drm/i915/intel_csr.c +Merging drm-panel/drm/panel/for-next (dd0150026901 drm/panel: simple: Add support for LG LB070WV8 800x480 7" panel) +$ git merge drm-panel/drm/panel/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/panel/lg,lb070wv8.txt | 7 ++++++ + drivers/gpu/drm/bridge/dw_hdmi.c | 2 +- + drivers/gpu/drm/bridge/ps8622.c | 20 ++++------------ + drivers/gpu/drm/bridge/ptn3460.c | 25 +++++++------------- + drivers/gpu/drm/panel/panel-simple.c | 27 ++++++++++++++++++++++ + 5 files changed, 48 insertions(+), 33 deletions(-) + create mode 100644 Documentation/devicetree/bindings/panel/lg,lb070wv8.txt +Merging drm-intel/for-linux-next (99c044d7d5cc drm/i915/dsi: remove non-op hot plug callback) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 7 +- + drivers/gpu/drm/i915/i915_debugfs.c | 81 ++-- + drivers/gpu/drm/i915/i915_dma.c | 10 +- + drivers/gpu/drm/i915/i915_drv.c | 36 +- + drivers/gpu/drm/i915/i915_drv.h | 161 +++++--- + drivers/gpu/drm/i915/i915_gem.c | 642 +++++++++++++++++------------ + drivers/gpu/drm/i915/i915_gem_context.c | 13 +- + drivers/gpu/drm/i915/i915_gem_debug.c | 92 +---- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 23 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 11 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 19 +- + drivers/gpu/drm/i915/i915_irq.c | 206 +++++---- + drivers/gpu/drm/i915/i915_reg.h | 32 +- + drivers/gpu/drm/i915/intel_bios.c | 150 +++---- + drivers/gpu/drm/i915/intel_crt.c | 15 +- + drivers/gpu/drm/i915/intel_csr.c | 53 +++ + drivers/gpu/drm/i915/intel_ddi.c | 137 +++--- + drivers/gpu/drm/i915/intel_display.c | 601 +++++++++++++++++++-------- + drivers/gpu/drm/i915/intel_dp.c | 176 ++++---- + drivers/gpu/drm/i915/intel_drv.h | 25 +- + drivers/gpu/drm/i915/intel_dsi.c | 14 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 4 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 80 ++-- + drivers/gpu/drm/i915/intel_hdmi.c | 113 ++--- + drivers/gpu/drm/i915/intel_i2c.c | 21 + + drivers/gpu/drm/i915/intel_lrc.c | 36 +- + drivers/gpu/drm/i915/intel_overlay.c | 2 - + drivers/gpu/drm/i915/intel_pm.c | 252 ++++++----- + drivers/gpu/drm/i915/intel_ringbuffer.c | 50 +-- + drivers/gpu/drm/i915/intel_runtime_pm.c | 104 +---- + drivers/gpu/drm/i915/intel_sdvo.c | 74 ++-- + drivers/gpu/drm/i915/intel_sideband.c | 18 +- + drivers/gpu/drm/i915/intel_sprite.c | 70 ++-- + include/drm/i915_pciids.h | 6 +- + include/uapi/drm/i915_drm.h | 9 +- + 36 files changed, 1958 insertions(+), 1387 deletions(-) +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 (5ceecb2fa720 drm: Fix off-by-one in vblank hardware counter wraparound handling) +$ git merge drm-misc/topic/drm-misc +Auto-merging Documentation/DocBook/drm.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 12 ++ + drivers/gpu/drm/drm_atomic.c | 162 ++++++++++++++++++- + drivers/gpu/drm/drm_atomic_helper.c | 117 ++++++++++---- + drivers/gpu/drm/drm_bridge.c | 242 ++++++++++++++++++++++++++++ + drivers/gpu/drm/drm_crtc.c | 304 ++++++++++++++++++++++++------------ + drivers/gpu/drm/drm_crtc_helper.c | 101 +++++------- + drivers/gpu/drm/drm_fops.c | 5 +- + drivers/gpu/drm/drm_ioctl.c | 2 + + drivers/gpu/drm/drm_irq.c | 4 +- + drivers/gpu/drm/drm_modes.c | 87 +++++++++++ + include/drm/drmP.h | 4 + + include/drm/drm_atomic.h | 34 ++-- + include/drm/drm_atomic_helper.h | 1 + + include/drm/drm_crtc.h | 27 +++- + include/drm/drm_modes.h | 4 + + include/uapi/drm/drm.h | 2 + + include/uapi/drm/drm_mode.h | 20 +++ + 17 files changed, 923 insertions(+), 205 deletions(-) +Merging drm-exynos/exynos-drm/for-next (9aeb8acbf0a2 drm/exynos: dp: Lower level of EDID read success message) +$ git merge drm-exynos/exynos-drm/for-next +Merge made by the 'recursive' strategy. +Merging drm-msm/msm-next (d5af49c92a8a drm/msm/mdp5: Enable DSI connector in msm drm driver) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging sound/for-next (cd6a65036f0e ALSA: replace CONFIG_PROC_FS with CONFIG_SND_PROC_FS) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_sigmatel.c +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/pci/hda/hda_intel.c +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 +Merge made by the 'recursive' strategy. + Documentation/sound/alsa/HD-Audio-Models.txt | 14 +- + Documentation/sound/alsa/Jack-Controls.txt | 43 + + drivers/gpu/drm/i915/i915_reg.h | 3 + + drivers/gpu/drm/i915/intel_audio.c | 27 + + include/drm/i915_component.h | 1 + + include/sound/control.h | 2 +- + include/sound/core.h | 4 - + include/sound/hda_i915.h | 36 + + include/sound/hda_register.h | 156 +++ + include/sound/hdaudio.h | 295 +++++- + 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 + + 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 | 2 +- + 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/dummy.c | 14 +- + 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/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/oss/ad1848.c | 2 + + sound/pci/ad1889.c | 4 +- + sound/pci/ali5451/ali5451.c | 4 +- + sound/pci/als300.c | 4 +- + sound/pci/als4000.c | 4 +- + sound/pci/au88x0/au88x0.c | 4 +- + sound/pci/aw2/aw2-alsa.c | 4 +- + sound/pci/azt3328.c | 4 +- + sound/pci/ca0106/ca0106_main.c | 4 +- + sound/pci/cs5535audio/cs5535audio.c | 4 +- + sound/pci/ctxfi/cthw20k1.c | 4 +- + sound/pci/ctxfi/cthw20k2.c | 4 +- + sound/pci/emu10k1/emu10k1_main.c | 4 +- + sound/pci/es1938.c | 4 +- + sound/pci/es1968.c | 4 +- + sound/pci/hda/Kconfig | 18 +- + sound/pci/hda/Makefile | 9 +- + sound/pci/hda/hda_codec.c | 425 +------- + sound/pci/hda/hda_codec.h | 82 +- + 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 | 382 +++++--- + 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_ca0132.c | 125 ++- + sound/pci/hda/patch_hdmi.c | 189 +++- + sound/pci/hda/patch_realtek.c | 40 + + sound/pci/hda/patch_sigmatel.c | 2 +- + sound/pci/ice1712/ice1712.c | 4 +- + sound/pci/lx6464es/lx6464es.c | 18 +- + sound/pci/maestro3.c | 4 +- + sound/pci/mixart/mixart.c | 2 +- + 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 | 23 +- + sound/soc/soc-jack.c | 3 +- + sound/sound_firmware.c | 4 +- + sound/usb/bcd2000/bcd2000.c | 2 +- + 104 files changed, 4610 insertions(+), 3208 deletions(-) + create mode 100644 Documentation/sound/alsa/Jack-Controls.txt + 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 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 +Merging sound-asoc/for-next (ebd5c5adfb88 Merge remote-tracking branches 'asoc/topic/wm8741', 'asoc/topic/wm8960', 'asoc/topic/wm8994' and 'asoc/topic/wm8996' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/soc-jack.c +Auto-merging sound/soc/qcom/lpass-lpaif-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/qcom,lpass-cpu.txt | 13 +- + .../devicetree/bindings/sound/renesas,rsnd.txt | 2 +- + Documentation/devicetree/bindings/sound/rt5677.txt | 2 + + .../devicetree/bindings/sound/tas571x.txt | 41 + + Documentation/devicetree/bindings/sound/wm8741.txt | 11 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 6 + + drivers/dma/sh/rcar-dmac.c | 37 +- + include/dt-bindings/sound/apq8016-lpass.h | 9 + + include/dt-bindings/sound/audio-jack-events.h | 9 + + include/sound/dmaengine_pcm.h | 5 - + include/sound/rt5645.h | 3 - + include/sound/soc-dapm.h | 46 + + include/sound/soc.h | 107 +- + 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.h | 4 +- + 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 | 1 - + sound/soc/codecs/cs42l56.c | 1 - + sound/soc/codecs/cs42l73.c | 1 - + 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 | 21 +- + 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 | 1085 ++++++++++++++----- + 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/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/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 | 2 - + sound/soc/codecs/wm1250-ev1.c | 2 - + sound/soc/codecs/wm5100.c | 6 +- + sound/soc/codecs/wm8350.c | 1 - + sound/soc/codecs/wm8400.c | 1 - + sound/soc/codecs/wm8510.c | 1 - + sound/soc/codecs/wm8523.c | 1 - + sound/soc/codecs/wm8580.c | 1 - + sound/soc/codecs/wm8711.c | 1 - + sound/soc/codecs/wm8728.c | 1 - + sound/soc/codecs/wm8731.c | 3 +- + sound/soc/codecs/wm8737.c | 9 +- + sound/soc/codecs/wm8741.c | 129 ++- + sound/soc/codecs/wm8741.h | 10 + + sound/soc/codecs/wm8750.c | 1 - + sound/soc/codecs/wm8753.c | 1 - + sound/soc/codecs/wm8770.c | 1 - + sound/soc/codecs/wm8776.c | 1 - + sound/soc/codecs/wm8900.c | 11 +- + sound/soc/codecs/wm8903.c | 2 - + sound/soc/codecs/wm8903.h | 2 +- + sound/soc/codecs/wm8904.c | 1 - + sound/soc/codecs/wm8940.c | 4 +- + sound/soc/codecs/wm8955.c | 5 +- + sound/soc/codecs/wm8960.c | 113 +- + sound/soc/codecs/wm8961.c | 2 - + sound/soc/codecs/wm8962.c | 1 - + sound/soc/codecs/wm8971.c | 1 - + sound/soc/codecs/wm8974.c | 1 - + sound/soc/codecs/wm8978.c | 5 +- + sound/soc/codecs/wm8983.c | 1 - + sound/soc/codecs/wm8985.c | 1 - + sound/soc/codecs/wm8988.c | 1 - + sound/soc/codecs/wm8990.c | 3 +- + sound/soc/codecs/wm8991.c | 1 - + sound/soc/codecs/wm8993.c | 6 +- + sound/soc/codecs/wm8994.c | 10 +- + sound/soc/codecs/wm8995.c | 1 - + sound/soc/codecs/wm8996.c | 8 +- + sound/soc/codecs/wm9081.c | 2 - + sound/soc/codecs/wm9090.c | 2 - + sound/soc/codecs/wm9712.c | 3 +- + sound/soc/codecs/wm9713.c | 7 +- + sound/soc/codecs/wm_adsp.c | 1132 ++++++++++++-------- + sound/soc/codecs/wm_adsp.h | 6 +- + 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 | 16 +- + 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 | 5 +- + sound/soc/intel/common/sst-ipc.h | 3 + + sound/soc/intel/haswell/sst-haswell-ipc.c | 12 + + 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 | 17 +- + 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 | 49 +- + sound/soc/soc-dapm.c | 312 +++++- + sound/soc/soc-generic-dmaengine-pcm.c | 25 +- + sound/soc/soc-jack.c | 9 +- + sound/soc/soc-pcm.c | 47 +- + sound/soc/ux500/mop500_ab8500.c | 4 + + sound/soc/ux500/ux500_pcm.c | 1 - + 198 files changed, 5327 insertions(+), 1935 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 include/dt-bindings/sound/apq8016-lpass.h + create mode 100644 include/dt-bindings/sound/audio-jack-events.h + 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%) +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 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 (e002273b3782 Input: synaptics_i2c - use proper boolean values) +$ git merge input/next +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 | 13 +- + drivers/input/misc/Makefile | 1 + + drivers/input/misc/adxl34x-i2c.c | 21 ++ + 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/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 | 3 + + drivers/input/touchscreen/s3c2410_ts.c | 2 +- + drivers/input/touchscreen/stmpe-ts.c | 37 +-- + drivers/input/touchscreen/zforce_ts.c | 1 - + include/linux/mfd/stmpe.h | 44 --- + include/linux/platform_data/keyboard-spear.h | 2 +- + 34 files changed, 567 insertions(+), 257 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/ti,drv2665.txt + create mode 100644 drivers/input/misc/drv2665.c +Merging block/for-next (cca58e6fe213 Merge branch 'for-4.2/core' into for-next) +$ git merge block/for-next +Removing kernel/power/block_io.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/blk_types.h +Removing include/asm-generic/scatterlist.h +Auto-merging fs/ext4/page-io.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging drivers/block/nvme-scsi.c +Auto-merging drivers/block/loop.c +Auto-merging block/bounce.c +Auto-merging block/blk-mq.c +Auto-merging block/blk-core.c +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/Kbuild | 1 - + arch/alpha/include/asm/pci.h | 2 +- + arch/arc/include/asm/Kbuild | 1 - + arch/arm/include/asm/Kbuild | 1 - + arch/arm/include/asm/dma.h | 2 +- + arch/arm/mach-footbridge/dma.c | 2 +- + arch/arm64/include/asm/Kbuild | 1 - + arch/avr32/include/asm/Kbuild | 1 - + arch/blackfin/include/asm/Kbuild | 1 - + arch/blackfin/include/asm/pci.h | 2 +- + arch/c6x/include/asm/Kbuild | 1 - + arch/cris/include/asm/Kbuild | 1 - + arch/cris/include/asm/dma-mapping.h | 2 +- + arch/cris/include/asm/pci.h | 2 +- + arch/frv/include/asm/Kbuild | 1 - + arch/frv/include/asm/dma-mapping.h | 2 +- + arch/frv/include/asm/pci.h | 2 +- + arch/hexagon/include/asm/Kbuild | 1 - + arch/ia64/include/asm/Kbuild | 1 - + arch/ia64/include/asm/pci.h | 2 +- + arch/m32r/include/asm/Kbuild | 1 - + arch/m68k/include/asm/Kbuild | 1 - + arch/metag/include/asm/Kbuild | 1 - + arch/microblaze/include/asm/Kbuild | 1 - + arch/microblaze/include/asm/pci.h | 2 +- + arch/mips/include/asm/Kbuild | 1 - + arch/mips/include/asm/dma-mapping.h | 2 +- + arch/mips/include/asm/pci.h | 2 +- + arch/mn10300/include/asm/Kbuild | 1 - + arch/mn10300/include/asm/pci.h | 2 +- + arch/nios2/include/asm/Kbuild | 1 - + arch/openrisc/include/asm/Kbuild | 1 - + arch/parisc/include/asm/Kbuild | 1 - + arch/parisc/include/asm/dma-mapping.h | 2 +- + arch/parisc/include/asm/pci.h | 2 +- + arch/powerpc/include/asm/Kbuild | 1 - + arch/powerpc/include/asm/pci.h | 2 +- + arch/powerpc/include/asm/vio.h | 2 +- + arch/s390/include/asm/Kbuild | 1 - + arch/score/include/asm/Kbuild | 1 - + arch/sh/include/asm/Kbuild | 1 - + arch/sparc/include/asm/Kbuild | 1 - + arch/sparc/kernel/iommu_common.h | 2 +- + arch/tile/include/asm/Kbuild | 1 - + arch/um/include/asm/Kbuild | 1 - + arch/unicore32/include/asm/Kbuild | 1 - + arch/x86/include/asm/Kbuild | 1 - + arch/x86/include/asm/pci.h | 2 +- + arch/xtensa/include/asm/Kbuild | 1 - + arch/xtensa/include/asm/pci.h | 2 +- + block/bio-integrity.c | 4 +- + block/bio.c | 77 ++- + block/blk-core.c | 136 +--- + block/blk-exec.c | 10 - + block/blk-mq.c | 148 ++-- + block/blk.h | 5 +- + block/bounce.c | 3 - + block/ioctl.c | 37 +- + drivers/block/cciss.c | 27 +- + drivers/block/loop.c | 82 ++- + drivers/block/loop.h | 3 +- + drivers/block/nbd.c | 52 +- + drivers/block/nvme-core.c | 543 +++++++-------- + drivers/block/nvme-scsi.c | 1224 ++++++++++----------------------- + drivers/block/paride/pd.c | 4 +- + drivers/block/sx8.c | 4 +- + drivers/block/virtio_blk.c | 6 +- + 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 | 2 +- + 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 | 171 ++--- + drivers/md/dm.h | 5 +- + drivers/mmc/host/android-goldfish.c | 2 +- + drivers/s390/block/dasd_genhd.c | 19 +- + 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 | 13 +- + fs/ext4/page-io.c | 1 - + fs/nilfs2/segbuf.c | 12 - + fs/xfs/xfs_aops.c | 1 - + include/asm-generic/scatterlist.h | 34 - + include/linux/bio.h | 17 +- + include/linux/blk_types.h | 25 +- + include/linux/blkdev.h | 45 +- + include/linux/dmapool.h | 2 +- + include/linux/fs.h | 3 + + include/linux/ide.h | 27 + + include/linux/nvme.h | 30 +- + include/linux/scatterlist.h | 39 +- + include/linux/swap.h | 1 - + include/uapi/linux/nbd.h | 2 - + kernel/power/Makefile | 3 +- + kernel/power/block_io.c | 103 --- + kernel/power/power.h | 9 - + kernel/power/swap.c | 159 +++-- + lib/swiotlb.c | 2 +- + mm/page_io.c | 2 +- + 116 files changed, 1307 insertions(+), 2057 deletions(-) + delete mode 100644 include/asm-generic/scatterlist.h + delete mode 100644 kernel/power/block_io.c +Merging device-mapper/for-next (a3554ba000da dm thin: range discard support) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + Documentation/device-mapper/dm-raid.txt | 2 + + 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 | 132 +- + drivers/md/dm-cache-metadata.h | 12 + + drivers/md/dm-cache-policy-cleaner.c | 6 +- + drivers/md/dm-cache-policy-internal.h | 38 +- + drivers/md/dm-cache-policy-mq.c | 43 +- + drivers/md/dm-cache-policy-smq.c | 1776 +++++++++++++++++++++++++ + drivers/md/dm-cache-policy.h | 22 +- + drivers/md/dm-cache-target.c | 774 ++++++++--- + drivers/md/dm-crypt.c | 30 +- + drivers/md/dm-log-writes.c | 4 +- + drivers/md/dm-mpath.c | 4 +- + drivers/md/dm-raid.c | 225 ++-- + drivers/md/dm-raid1.c | 75 +- + drivers/md/dm-stats.c | 5 +- + 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 | 610 ++++++--- + drivers/md/dm.c | 179 +-- + 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 + + 29 files changed, 3675 insertions(+), 592 deletions(-) + create mode 100644 drivers/md/dm-cache-policy-smq.c +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 (26225be7aef4 mmc: sdhci-pci: Enable HS400 for some Intel host controllers) +$ git merge mmc-uh/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.txt | 3 +- + .../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 | 142 +++++++++- + drivers/mmc/core/mmc_ops.c | 44 +-- + drivers/mmc/core/mmc_ops.h | 1 + + drivers/mmc/core/sd.c | 99 +++---- + drivers/mmc/core/sdio.c | 90 +++---- + 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-esdhc-imx.c | 50 +++- + drivers/mmc/host/sdhci-of-arasan.c | 7 + + drivers/mmc/host/sdhci-of-esdhc.c | 4 +- + 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 | 4 +- + 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 | 140 +++------- + 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 + + 57 files changed, 1108 insertions(+), 543 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 (181effb6da11 md/raid5: break stripe-batches when the array has failed.) +$ git merge md/for-next +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + block/genhd.c | 13 ++-- + drivers/md/md.c | 149 +++++++++++++++++++---------------- + drivers/md/raid10.c | 18 +---- + drivers/md/raid5.c | 164 ++++++++++++++++++++++----------------- + drivers/md/raid5.h | 5 +- + include/linux/backing-dev.h | 1 - + include/linux/wait.h | 13 ++++ + include/trace/events/writeback.h | 1 - + mm/backing-dev.c | 18 +---- + 9 files changed, 201 insertions(+), 181 deletions(-) +Merging mfd/for-mfd-next (79a1726fd29c mfd: mt6397-core: Add GPIO sub-module support) +$ git merge mfd/for-mfd-next +Auto-merging drivers/rtc/Makefile +Auto-merging drivers/rtc/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + 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/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/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/mfd-core.c | 8 +- + drivers/mfd/mt6397-core.c | 5 +- + drivers/mfd/stmpe.c | 2 +- + drivers/mfd/tc3589x.c | 2 +- + drivers/mfd/tps6586x.c | 2 +- + drivers/mfd/twl4030-power.c | 45 ++- + drivers/mfd/twl6030-irq.c | 2 +- + drivers/mfd/wm831x-irq.c | 2 +- + 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/da9063/pdata.h | 1 + + include/linux/mfd/max77686.h | 5 - + 57 files changed, 1791 insertions(+), 199 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 (843735b788a4 power: axp288_charger: axp288 charger driver) +$ git merge battery/master +Auto-merging include/linux/mfd/axp20x.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/bq24257.txt | 21 + + .../devicetree/bindings/power/bq25890.txt | 46 + + drivers/power/Kconfig | 21 + + drivers/power/Makefile | 3 + + drivers/power/axp288_charger.c | 941 +++++++++++++++++++ + drivers/power/axp288_fuel_gauge.c | 2 +- + drivers/power/bq2415x_charger.c | 94 +- + drivers/power/bq24257_charger.c | 863 ++++++++++++++++++ + drivers/power/bq25890_charger.c | 999 +++++++++++++++++++++ + drivers/power/charger-manager.c | 3 +- + drivers/power/max17042_battery.c | 190 +++- + drivers/power/power_supply_core.c | 61 +- + drivers/power/power_supply_leds.c | 4 +- + drivers/power/power_supply_sysfs.c | 2 +- + drivers/power/reset/at91-reset.c | 2 +- + drivers/power/reset/gpio-poweroff.c | 25 +- + drivers/power/reset/ltc2952-poweroff.c | 7 +- + include/linux/mfd/axp20x.h | 7 + + include/linux/power/max17042_battery.h | 4 + + include/linux/power_supply.h | 1 + + 20 files changed, 3224 insertions(+), 72 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/bq24257.txt + create mode 100644 Documentation/devicetree/bindings/power/bq25890.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 +Merging omap_dss2/for-next (36520841a443 video/console: use swap() in newport_bmove()) +$ git merge omap_dss2/for-next +Auto-merging drivers/video/fbdev/mxsfb.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 +- + drivers/video/console/newport_con.c | 6 +- + drivers/video/fbdev/Kconfig | 1 + + drivers/video/fbdev/amifb.c | 4 +- + drivers/video/fbdev/core/Makefile | 2 +- + drivers/video/fbdev/core/fb_defio.c | 2 - + drivers/video/fbdev/matrox/matroxfb_base.c | 6 +- + drivers/video/fbdev/mxsfb.c | 68 ++++- + drivers/video/fbdev/omap/Kconfig | 2 +- + drivers/video/fbdev/ssd1307fb.c | 289 +++++++++++++++------ + 11 files changed, 293 insertions(+), 111 deletions(-) +Merging regulator/for-next (f114db4aa4da Merge remote-tracking branches 'regulator/topic/max8973' and 'regulator/topic/of' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../bindings/regulator/max8973-regulator.txt | 16 + + .../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/da9062-regulator.c | 843 +++++++++++++++++++++ + drivers/regulator/fan53555.c | 1 + + drivers/regulator/helpers.c | 2 +- + 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 | 118 ++- + drivers/regulator/of_regulator.c | 4 +- + drivers/regulator/s2mps11.c | 10 +- + include/linux/regulator/max8973-regulator.h | 4 + + 17 files changed, 1066 insertions(+), 185 deletions(-) + create mode 100644 drivers/regulator/da9062-regulator.c +Merging security/next (8d94eb9b5cff ima: pass iint to ima_add_violation()) +$ 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 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 7972e58c2ea9] Merge remote-tracking branch 'security/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/ima_policy | 20 +- + Documentation/kernel-parameters.txt | 2 +- + 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/security.h | 1623 +------------------------ + 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 | 490 ++++---- + security/smack/smack.h | 4 +- + security/smack/smack_lsm.c | 307 +++-- + security/smack/smackfs.c | 2 +- + security/tomoyo/tomoyo.c | 72 +- + security/yama/yama_lsm.c | 60 +- + 32 files changed, 3223 insertions(+), 3807 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 e1fb1cb4e807] Merge remote-tracking branch 'security/next' + Date: Thu May 28 16:02:06 2015 +1000 +Merging integrity/next (8d94eb9b5cff ima: pass iint to ima_add_violation()) +$ git merge integrity/next +Already up-to-date. +Merging selinux/next (6f29997f4a31 selinux: enable per-file labeling for debugfs files.) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Auto-merging kernel/signal.c +Auto-merging include/linux/sched.h +Merge made by the 'recursive' strategy. + include/linux/sched.h | 1 - + kernel/signal.c | 13 ++----- + security/selinux/hooks.c | 74 ++++++++++++++++++++++--------------- + security/selinux/include/classmap.h | 22 ++++++++--- + security/selinux/include/security.h | 1 + + 5 files changed, 65 insertions(+), 46 deletions(-) +Merging lblnet/next (b2776bf7149b Linux 3.18) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (ba155e2d21f6 Linux 4.1-rc5) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (60dcc6f0bcf4 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/exynos' and 'core' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/iommu/exynos-iommu.c | 1 + + drivers/iommu/iova.c | 4 ++++ + drivers/iommu/rockchip-iommu.c | 23 +++++++++++++++++------ + 3 files changed, 22 insertions(+), 6 deletions(-) +Merging dwmw2-iommu/master (4ed6a540fab8 iommu/vt-d: Fix passthrough mode with translation-disabled devices) +$ git merge dwmw2-iommu/master +Merge made by the 'recursive' strategy. + drivers/iommu/intel-iommu.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) +Merging vfio/next (5a0ff17741c1 vfio-pci: Fix use after free) +$ git merge vfio/next +Already up-to-date. +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 (bde1b29420d7 stable: Update documentation to clarify preferred procedure) +$ git merge jc_docs/docs-next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/kasan.txt +Merge made by the 'recursive' strategy. + Documentation/CodingStyle | 2 +- + Documentation/DMA-API-HOWTO.txt | 4 ++-- + Documentation/SubmittingPatches | 4 +++- + Documentation/blackfin/gptimers-example.c | 14 +++++++++++--- + Documentation/filesystems/proc.txt | 3 ++- + Documentation/gpio/consumer.txt | 2 +- + Documentation/kasan.txt | 2 +- + Documentation/kernel-parameters.txt | 2 +- + Documentation/magic-number.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 ++++++++++++-- + 14 files changed, 57 insertions(+), 29 deletions(-) +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/media/pci/cx25821/cx25821-medusa-reg.h | 6 +++--- + 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 +- + 22 files changed, 32 insertions(+), 32 deletions(-) +Merging audit/next (39a8804455fb Linux 4.0) +$ git merge audit/next +Already up-to-date. +Merging devicetree/devicetree/next (a2166ca5f320 Merge remote-tracking branch 'robh/for-next' into devicetree/next) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (4760597116e3 scripts/dtc: Update to upstream version 9d3649bd3be245c9) +$ git merge dt-rh/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/libfdt_env.h | 4 + + arch/powerpc/boot/libfdt_env.h | 4 + + arch/powerpc/boot/of.h | 2 + + include/linux/libfdt_env.h | 4 + + 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 +- + 34 files changed, 1768 insertions(+), 1535 deletions(-) +Merging mailbox/mailbox-for-next (4c0f74bf82e8 mailbox: Enable BCM2835 mailbox support) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + .../bindings/mailbox/brcm,bcm2835-mbox.txt | 26 ++ + .../bindings/mailbox/nvidia,tegra124-xusb-mbox.txt | 30 +++ + drivers/mailbox/Kconfig | 17 ++ + drivers/mailbox/Makefile | 4 + + drivers/mailbox/arm_mhu.c | 2 +- + drivers/mailbox/bcm2835-mailbox.c | 216 +++++++++++++++ + drivers/mailbox/mailbox-altera.c | 2 +- + drivers/mailbox/mailbox.c | 11 +- + drivers/mailbox/omap-mailbox.c | 8 +- + drivers/mailbox/pcc.c | 2 +- + drivers/mailbox/tegra-xusb-mailbox.c | 290 +++++++++++++++++++++ + include/linux/mailbox_controller.h | 2 +- + include/soc/tegra/xusb.h | 43 +++ + 13 files changed, 642 insertions(+), 11 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt + create mode 100644 Documentation/devicetree/bindings/mailbox/nvidia,tegra124-xusb-mbox.txt + create mode 100644 drivers/mailbox/bcm2835-mailbox.c + create mode 100644 drivers/mailbox/tegra-xusb-mailbox.c + create mode 100644 include/soc/tegra/xusb.h +Merging spi/for-next (3f6d0d8e2000 Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/sirf' and 'spi/topic/spidev' into spi-next) +$ git merge spi/for-next +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 | 11 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-ath79.c | 34 +- + drivers/spi/spi-bcm2835.c | 392 ++++++++- + drivers/spi/spi-fsl-dspi.c | 6 +- + 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-rb4xx.c | 210 +++++ + drivers/spi/spi-rspi.c | 15 +- + drivers/spi/spi-s3c64xx.c | 2 +- + drivers/spi/spi-sh-msiof.c | 2 +- + drivers/spi/spi-sirf.c | 877 +++++++++++++++------ + drivers/spi/spi.c | 11 +- + drivers/spi/spidev.c | 33 +- + 21 files changed, 1500 insertions(+), 493 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spi-ath79.txt + create mode 100644 drivers/spi/spi-rb4xx.c +Merging tip/auto-latest (a079e986132b manual merge of x86/ras) +$ git merge tip/auto-latest +Recorded preimage for 'arch/sparc/include/asm/topology_64.h' +Auto-merging net/sched/sch_api.c +Auto-merging net/core/pktgen.c +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 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 +Removing include/linux/preempt_mask.h +Removing include/linux/platform_data/irq-renesas-irqc.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/compiler.h +Auto-merging drivers/power/reset/ltc2952-poweroff.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/net/ethernet/sfc/efx.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/drm_ioctl.c +Removing arch/x86/lib/copy_user_nocache_64.S +Removing arch/x86/kernel/xsave.c +Removing arch/x86/kernel/i387.c +Removing arch/x86/include/asm/xsave.h +Removing arch/x86/include/asm/xcr.h +Auto-merging arch/x86/include/asm/pci.h +Removing arch/x86/include/asm/i387.h +Removing arch/x86/include/asm/fpu-internal.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/include/asm/uaccess.h +Auto-merging arch/sparc/include/asm/topology_64.h +CONFLICT (content): Merge conflict in arch/sparc/include/asm/topology_64.h +Auto-merging Makefile +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 +Recorded resolution for 'arch/sparc/include/asm/topology_64.h'. +[master 748e1ac2bfd0] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/cputopology.txt | 37 +- + Documentation/kernel-parameters.txt | 6 + + Documentation/memory-barriers.txt | 6 +- + Documentation/preempt-locking.txt | 2 +- + Documentation/scheduler/sched-deadline.txt | 184 ++- + Documentation/x86/boot.txt | 2 +- + Documentation/x86/{x86_64 => }/kernel-stacks | 54 +- + Documentation/x86/mtrr.txt | 18 +- + Documentation/x86/pat.txt | 35 +- + Kbuild | 34 +- + Makefile | 5 +- + arch/alpha/include/asm/cmpxchg.h | 2 - + arch/alpha/mm/fault.c | 5 +- + arch/arc/include/asm/futex.h | 10 +- + arch/arc/mm/fault.c | 2 +- + arch/arm/include/asm/barrier.h | 2 +- + arch/arm/include/asm/futex.h | 13 +- + 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/topology.h | 2 +- + arch/arm64/mm/fault.c | 2 +- + arch/avr32/include/asm/cmpxchg.h | 2 - + arch/avr32/include/asm/uaccess.h | 12 +- + arch/avr32/mm/fault.c | 4 +- + arch/cris/mm/fault.c | 6 +- + 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/uaccess.h | 30 +- + arch/m32r/mm/fault.c | 8 +- + arch/m68k/include/asm/cmpxchg.h | 1 - + 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/mm/fault.c | 2 +- + arch/metag/mm/highmem.c | 4 +- + 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/mm/fault.c | 4 +- + 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 | 2 +- + 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/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/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/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/Kconfig | 20 +- + arch/x86/Kconfig.debug | 23 + + arch/x86/Makefile | 9 + + 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/ia32/ia32_signal.c | 13 +- + arch/x86/ia32/ia32entry.S | 52 +- + 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/cmpxchg.h | 2 - + arch/x86/include/asm/crypto/glue_helper.h | 2 +- + arch/x86/include/asm/dma-mapping.h | 46 +- + 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 | 45 + + 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 | 4 + + 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 | 18 +- + 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/mpx.h | 8 +- + arch/x86/include/asm/msi.h | 7 + + 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 | 7 +- + arch/x86/include/asm/pci.h | 5 - + arch/x86/include/asm/processor.h | 148 +-- + arch/x86/include/asm/qspinlock.h | 57 + + arch/x86/include/asm/qspinlock_paravirt.h | 6 + + arch/x86/include/asm/segment.h | 14 +- + 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 | 2 +- + arch/x86/include/asm/trace/irq_vectors.h | 6 + + 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/mtrr.h | 8 +- + arch/x86/include/uapi/asm/sigcontext.h | 8 +- + arch/x86/kernel/Makefile | 2 +- + 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 | 21 - + arch/x86/kernel/cpu/amd.c | 12 +- + arch/x86/kernel/cpu/bugs.c | 55 +- + arch/x86/kernel/cpu/common.c | 68 +- + arch/x86/kernel/cpu/mcheck/mce.c | 15 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 141 +- + arch/x86/kernel/cpu/microcode/amd_early.c | 19 +- + arch/x86/kernel/cpu/microcode/core.c | 76 +- + arch/x86/kernel/cpu/microcode/core_early.c | 23 +- + arch/x86/kernel/cpu/microcode/intel.c | 79 +- + arch/x86/kernel/cpu/microcode/intel_early.c | 38 +- + 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 | 88 +- + arch/x86/kernel/cpu/perf_event.h | 27 +- + arch/x86/kernel/cpu/perf_event_intel.c | 239 ++-- + arch/x86/kernel/cpu/perf_event_intel_cqm.c | 108 +- + arch/x86/kernel/cpu/perf_event_intel_ds.c | 4 +- + arch/x86/kernel/cpu/perf_event_intel_pt.c | 72 +- + 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 | 2 + + arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 20 + + arch/x86/kernel/cpu/proc.c | 3 +- + arch/x86/kernel/devicetree.c | 41 +- + arch/x86/kernel/entry_64.S | 82 +- + 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 | 400 ++++++ + arch/x86/kernel/head64.c | 2 +- + arch/x86/kernel/head_32.S | 37 +- + arch/x86/kernel/head_64.S | 24 +- + arch/x86/kernel/hpet.c | 57 +- + 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/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 | 3 +- + arch/x86/kernel/signal.c | 38 +- + arch/x86/kernel/smp.c | 19 +- + arch/x86/kernel/smpboot.c | 88 +- + arch/x86/kernel/traps.c | 136 +- + arch/x86/kernel/tsc_sync.c | 2 +- + 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 | 2 +- + arch/x86/lib/copy_user_64.S | 116 +- + arch/x86/lib/copy_user_nocache_64.S | 136 -- + arch/x86/lib/mmx_32.c | 2 +- + 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/iomap_32.c | 4 +- + arch/x86/mm/ioremap.c | 47 +- + arch/x86/mm/mpx.c | 15 +- + arch/x86/mm/pageattr.c | 20 +- + arch/x86/mm/pat.c | 82 +- + arch/x86/mm/pat_internal.h | 2 +- + arch/x86/mm/pat_rbtree.c | 6 +- + arch/x86/mm/pgtable.c | 60 +- + 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 +++ + .../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/asm/barrier.h | 3 +- + arch/x86/xen/enlighten.c | 5 +- + arch/x86/xen/spinlock.c | 64 +- + arch/x86/xen/xen-asm_64.S | 22 +- + arch/x86/xen/xen-ops.h | 2 + + 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/base/topology.c | 2 +- + drivers/char/hw_random/via-rng.c | 2 +- + drivers/clocksource/asm9260_timer.c | 2 +- + drivers/clocksource/timer-integrator-ap.c | 2 +- + drivers/clocksource/timer-sun5i.c | 2 +- + drivers/cpufreq/acpi-cpufreq.c | 5 +- + 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/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-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-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/pci/htirq.c | 48 +- + drivers/pci/quirks.c | 7 - + drivers/power/reset/ltc2952-poweroff.c | 1 - + .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/service.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 | 8 + + 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 | 7 +- + include/linux/clocksource.h | 1 - + include/linux/compiler.h | 4 +- + include/linux/context_tracking.h | 10 - + include/linux/context_tracking_state.h | 1 + + include/linux/dmar.h | 3 +- + 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 | 7 + + 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 | 34 +- + include/linux/platform_data/irq-renesas-irqc.h | 27 - + include/linux/preempt.h | 123 +- + include/linux/preempt_mask.h | 117 -- + include/linux/rcupdate.h | 6 +- + include/linux/rcutree.h | 2 +- + include/linux/sched.h | 136 +- + 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 +- + init/Kconfig | 2 +- + ipc/mqueue.c | 54 +- + kernel/Kconfig.locks | 13 +- + kernel/context_tracking.c | 67 +- + kernel/events/core.c | 120 +- + kernel/events/ring_buffer.c | 14 + + 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/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/tree_plugin.h | 14 +- + kernel/sched/Makefile | 2 +- + kernel/sched/auto_group.c | 6 +- + kernel/sched/auto_group.h | 2 +- + kernel/sched/core.c | 133 +- + kernel/sched/cputime.c | 2 +- + kernel/sched/deadline.c | 14 +- + kernel/sched/debug.c | 2 - + kernel/sched/fair.c | 352 +++-- + 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/time/Makefile | 17 +- + kernel/time/alarmtimer.c | 17 +- + kernel/time/clockevents.c | 22 +- + 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 | 81 +- + kernel/time/tick-common.c | 10 + + kernel/time/tick-internal.h | 2 + + kernel/time/tick-oneshot.c | 16 + + 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 +- + 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 +- + sound/core/hrtimer.c | 9 +- + sound/drivers/pcsp/pcsp.c | 17 +- + 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.feature | 4 +- + 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/include/linux/types.h | 8 + + tools/lib/traceevent/Makefile | 20 +- + 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 | 19 + + tools/perf/Makefile.perf | 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 | 10 +- + 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 | 274 +++- + tools/perf/builtin-report.c | 37 +- + tools/perf/builtin-sched.c | 82 +- + tools/perf/builtin-script.c | 94 +- + tools/perf/builtin-stat.c | 146 ++- + tools/perf/builtin-timechart.c | 9 +- + tools/perf/builtin-top.c | 2 +- + tools/perf/builtin-trace.c | 75 +- + tools/perf/config/Makefile | 9 + + tools/perf/perf-sys.h | 73 +- + tools/perf/perf.h | 5 + + tools/perf/tests/builtin-test.c | 2 +- + tools/perf/tests/code-reading.c | 24 +- + tools/perf/tests/dwarf-unwind.c | 1 + + tools/perf/tests/evsel-roundtrip-name.c | 4 +- + tools/perf/tests/hists_common.c | 1 + + tools/perf/tests/hists_cumulate.c | 6 +- + tools/perf/tests/hists_filter.c | 8 +- + tools/perf/tests/hists_link.c | 12 +- + tools/perf/tests/hists_output.c | 6 +- + tools/perf/tests/keep-tracking.c | 4 +- + tools/perf/tests/make | 18 +- + tools/perf/tests/mmap-thread-lookup.c | 2 + + tools/perf/tests/parse-events.c | 2 +- + 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 | 9 + + tools/perf/tests/thread-mg-share.c | 41 +- + tools/perf/ui/browsers/hists.c | 633 +++++---- + tools/perf/util/Build | 11 +- + tools/perf/util/auxtrace.c | 1352 ++++++++++++++++++++ + tools/perf/util/auxtrace.h | 643 ++++++++++ + tools/perf/util/build-id.c | 5 +- + 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/data-convert-bt.c | 410 +++++- + tools/perf/util/db-export.c | 14 +- + tools/perf/util/dso.c | 136 +- + tools/perf/util/dso.h | 4 + + 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 | 57 + + tools/perf/util/event.h | 72 ++ + tools/perf/util/evlist.c | 85 +- + tools/perf/util/evlist.h | 11 +- + tools/perf/util/evsel.c | 1 + + tools/perf/util/evsel.h | 4 +- + tools/perf/util/header.c | 37 + + tools/perf/util/header.h | 1 + + tools/perf/util/hist.c | 2 +- + tools/perf/util/machine.c | 118 +- + tools/perf/util/machine.h | 9 +- + tools/perf/util/map.c | 9 +- + tools/perf/util/map.h | 9 +- + tools/perf/util/pager.c | 5 - + tools/perf/util/parse-events.c | 194 ++- + tools/perf/util/parse-events.h | 36 +- + tools/perf/util/parse-events.l | 41 +- + tools/perf/util/parse-events.y | 48 +- + tools/perf/util/parse-options.h | 4 + + tools/perf/util/pmu.c | 57 +- + tools/perf/util/pmu.h | 6 +- + tools/perf/util/probe-event.c | 337 ++--- + tools/perf/util/probe-event.h | 23 +- + tools/perf/util/probe-finder.c | 163 ++- + 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 | 184 ++- + tools/perf/util/session.h | 6 + + tools/perf/util/sort.c | 4 +- + tools/perf/util/sort.h | 38 +- + tools/perf/util/strfilter.c | 107 ++ + tools/perf/util/strfilter.h | 35 + + tools/perf/util/symbol-elf.c | 13 +- + tools/perf/util/symbol.c | 60 +- + tools/perf/util/symbol.h | 12 +- + tools/perf/util/thread.c | 14 +- + tools/perf/util/thread.h | 5 +- + tools/perf/util/tool.h | 12 +- + tools/perf/util/util.c | 81 +- + tools/perf/util/util.h | 6 + + tools/testing/selftests/x86/Makefile | 5 +- + tools/testing/selftests/x86/sysret_ss_attrs.c | 112 ++ + tools/testing/selftests/x86/thunks.S | 67 + + 626 files changed, 19443 insertions(+), 10285 deletions(-) + rename Documentation/x86/{x86_64 => }/kernel-stacks (68%) + 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 + create mode 100644 arch/x86/include/asm/qspinlock.h + create mode 100644 arch/x86/include/asm/qspinlock_paravirt.h + delete mode 100644 arch/x86/include/asm/xcr.h + delete mode 100644 arch/x86/include/asm/xsave.h + 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 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/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 + create mode 100644 tools/perf/Documentation/callchain-overhead-calculation.txt + create mode 100644 tools/perf/arch/powerpc/util/sym-handling.c + create mode 100644 tools/perf/bench/futex-wake-parallel.c + create mode 100644 tools/perf/util/auxtrace.c + create mode 100644 tools/perf/util/auxtrace.h + create mode 100644 tools/testing/selftests/x86/sysret_ss_attrs.c + create mode 100644 tools/testing/selftests/x86/thunks.S +Merging clockevents/clockevents/next (645d558b1cd5 Merge branch 'clockevents/4.2' into clockevents/next) +$ git merge clockevents/clockevents/next +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/armv7m_systick.txt | 26 ++ + .../bindings/timer/nxp,lpc3220-timer.txt | 26 ++ + .../devicetree/bindings/timer/st,stm32-timer.txt | 22 ++ + drivers/clocksource/Kconfig | 17 ++ + drivers/clocksource/Makefile | 3 + + drivers/clocksource/armv7m_systick.c | 79 ++++++ + drivers/clocksource/exynos_mct.c | 22 +- + drivers/clocksource/qcom-timer.c | 59 ----- + drivers/clocksource/time-lpc32xx.c | 272 +++++++++++++++++++++ + drivers/clocksource/timer-stm32.c | 184 ++++++++++++++ + 10 files changed, 632 insertions(+), 78 deletions(-) + 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 + create mode 100644 drivers/clocksource/armv7m_systick.c + create mode 100644 drivers/clocksource/time-lpc32xx.c + create mode 100644 drivers/clocksource/timer-stm32.c +Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (30c7469ba6f5 MAINTAINERS: Change Johannes Thumshirn's email address) +$ git merge edac-amd/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 10 +++++----- + drivers/edac/Kconfig | 4 ++-- + 2 files changed, 7 insertions(+), 7 deletions(-) +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 (d0ee8f4a1f5f tracing: Rename ftrace_get_offsets_##call() to trace_event_get_offsets_##call()) +$ git merge ftrace/for-next +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 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/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 | 2 +- + 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 +- + 39 files changed, 922 insertions(+), 929 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 (d254f32b7c03 rcu: Deinline rcu_read_lock_sched_held() if DEBUG_LOCK_ALLOC) +$ git merge rcu/rcu/next +Recorded preimage for 'include/linux/rcupdate.h' +Resolved 'include/linux/rcutree.h' using previous resolution. +Resolved 'kernel/rcu/tree_plugin.h' using previous resolution. +Auto-merging lib/Kconfig.debug +Auto-merging kernel/rcu/tree_plugin.h +CONFLICT (content): Merge conflict in kernel/rcu/tree_plugin.h +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/rcu/tiny.c +Auto-merging kernel/events/ring_buffer.c +Auto-merging init/Kconfig +Auto-merging include/linux/rcutree.h +CONFLICT (content): Merge conflict in include/linux/rcutree.h +Auto-merging include/linux/rcupdate.h +CONFLICT (content): Merge conflict in include/linux/rcupdate.h +Auto-merging include/linux/compiler.h +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging arch/powerpc/include/asm/barrier.h +Auto-merging arch/arm/kernel/smp.c +Auto-merging Documentation/memory-barriers.txt +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/linux/rcupdate.h'. +[master 5c4d4e64179c] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/arrayRCU.txt | 20 +- + Documentation/RCU/lockdep.txt | 10 - + Documentation/RCU/rcu_dereference.txt | 40 +-- + Documentation/RCU/whatisRCU.txt | 6 +- + Documentation/kernel-parameters.txt | 68 +++- + Documentation/memory-barriers.txt | 64 ++-- + arch/arm/kernel/smp.c | 6 +- + arch/powerpc/include/asm/barrier.h | 1 + + arch/x86/kernel/cpu/mcheck/mce.c | 15 +- + include/linux/compiler.h | 16 + + include/linux/rculist.h | 10 +- + include/linux/rcupdate.h | 112 +----- + include/linux/rcutiny.h | 16 + + include/linux/rcutree.h | 7 +- + include/linux/spinlock.h | 2 +- + init/Kconfig | 79 ++--- + kernel/cpu.c | 4 +- + kernel/events/ring_buffer.c | 2 +- + kernel/locking/locktorture.c | 14 +- + kernel/rcu/rcutorture.c | 122 ++++--- + kernel/rcu/srcu.c | 10 +- + kernel/rcu/tiny.c | 38 +-- + kernel/rcu/tiny_plugin.h | 12 +- + kernel/rcu/tree.c | 379 ++++++++++++--------- + kernel/rcu/tree.h | 41 ++- + kernel/rcu/tree_plugin.h | 216 ++++++------ + kernel/rcu/tree_trace.c | 6 +- + kernel/rcu/update.c | 79 ++++- + kernel/time/Kconfig | 2 - + kernel/torture.c | 26 +- + lib/Kconfig.debug | 66 +++- + .../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 +- + 59 files changed, 914 insertions(+), 703 deletions(-) + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE03.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot +$ 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 043fdfb68ec6] Merge remote-tracking branch 'rcu/rcu/next' + Date: Thu May 28 17:20:05 2015 +1000 +Merging kvm/linux-next (3520469d65f2 KVM: export __gfn_to_pfn_memslot, drop gfn_to_pfn_async) +$ 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/mmu.h +Auto-merging arch/x86/kvm/mmu.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 4fbb8d245b54] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 3 +- + arch/arm/kvm/arm.c | 4 +- + arch/mips/kvm/mips.c | 6 +- + arch/powerpc/kvm/booke.c | 6 +- + arch/powerpc/kvm/powerpc.c | 2 +- + arch/s390/include/asm/kvm_host.h | 4 +- + arch/s390/kernel/entry.S | 2 +- + arch/s390/kvm/intercept.c | 16 -- + arch/s390/kvm/interrupt.c | 87 ++++---- + arch/s390/kvm/kvm-s390.c | 61 ++++-- + arch/s390/kvm/kvm-s390.h | 25 ++- + arch/s390/kvm/priv.c | 8 +- + arch/x86/include/asm/kvm_host.h | 15 +- + arch/x86/include/asm/pvclock.h | 1 - + arch/x86/include/uapi/asm/kvm.h | 3 + + arch/x86/kvm/emulate.c | 41 +++- + arch/x86/kvm/ioapic.c | 9 +- + arch/x86/kvm/irq_comm.c | 14 +- + arch/x86/kvm/lapic.c | 26 ++- + arch/x86/kvm/lapic.h | 8 +- + arch/x86/kvm/mmu.c | 418 ++++++++++++++++++++------------------ + arch/x86/kvm/mmu.h | 2 + + arch/x86/kvm/mmu_audit.c | 4 +- + arch/x86/kvm/svm.c | 32 +-- + arch/x86/kvm/vmx.c | 224 ++++++++++++++++---- + arch/x86/kvm/x86.c | 131 ++++++++++-- + arch/x86/kvm/x86.h | 2 + + include/linux/kvm_host.h | 32 ++- + include/uapi/linux/kvm.h | 1 + + virt/kvm/kvm_main.c | 38 ++-- + 30 files changed, 792 insertions(+), 433 deletions(-) +Merging kvm-arm/next (2fa462f82621 Merge tag 'kvm-arm-for-4.1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master) +$ 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 (06b36753a646 KVM: s390: drop handling of interception code 12) +$ 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 (5b7fedea8db6 kernel: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 | 486 +++++++++++++++++++++++++++++--------------- + 3 files changed, 354 insertions(+), 165 deletions(-) +Merging drivers-x86/for-next (61104aa44529 dell-laptop: Use dell-rbtn instead i8042 filter when possible) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-toshiba_haps | 20 + + MAINTAINERS | 5 + + drivers/platform/x86/Kconfig | 15 +- + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/asus-wmi.c | 344 +++++++++++++++- + drivers/platform/x86/dell-laptop.c | 67 +++- + drivers/platform/x86/dell-rbtn.c | 434 +++++++++++++++++++++ + drivers/platform/x86/dell-rbtn.h | 35 ++ + drivers/platform/x86/toshiba_acpi.c | 246 +++--------- + drivers/platform/x86/toshiba_bluetooth.c | 174 +++++++-- + drivers/platform/x86/toshiba_haps.c | 32 +- + 11 files changed, 1098 insertions(+), 275 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-toshiba_haps + create mode 100644 drivers/platform/x86/dell-rbtn.c + create mode 100644 drivers/platform/x86/dell-rbtn.h +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 (67f2271e4cea 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 | 2 +- + drivers/base/regmap/regmap.c | 24 +++++++++++++++++++++ + include/linux/regmap.h | 14 +++++++++++++ + 5 files changed, 72 insertions(+), 16 deletions(-) +Merging hsi/for-next (265ef3ee9575 HSI: cmt_speech: fix error return code) +$ git merge hsi/for-next +Already up-to-date. +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 (c32e9840e96a ipmi: Add a comment in how messages are delivered from the lower layer) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging driver-core/driver-core-next (e0fd9b1d9c44 firmware: use const for remaining firmware names) +$ 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 arch/powerpc/mm/hugetlbpage.c +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/ABI/testing/sysfs-devices-system-cpu +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 | 161 ++++++++++++++++++--- + drivers/base/firmware_class.c | 61 ++++++-- + drivers/base/platform.c | 13 ++ + drivers/edac/amd64_edac.c | 1 + + fs/kernfs/file.c | 1 - + 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 +- + 22 files changed, 363 insertions(+), 77 deletions(-) +Merging tty/tty-next (a5edce421848 fbcon: Avoid deleting a timer in IRQ context) +$ git merge tty/tty-next +Resolved 'drivers/tty/serial/amba-pl011.c' using previous resolution. +Auto-merging drivers/tty/sysrq.c +Auto-merging drivers/tty/serial/sh-sci.c +Removing drivers/tty/serial/msm_smd_tty.c +Auto-merging drivers/tty/serial/imx.c +Auto-merging drivers/tty/serial/amba-pl011.c +CONFLICT (content): Merge conflict in drivers/tty/serial/amba-pl011.c +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/n_tty.c +Removing drivers/tty/hvc/hvc_beat.c +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 68ac0f2d398f] 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/renesas,sci-serial.txt | 7 + + .../devicetree/bindings/serial/sirf-uart.txt | 15 +- + 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 | 22 +- + drivers/tty/serial/8250/8250_early.c | 2 +- + drivers/tty/serial/8250/8250_mtk.c | 119 ++-- + drivers/tty/serial/8250/8250_omap.c | 147 ++++- + drivers/tty/serial/Kconfig | 12 +- + drivers/tty/serial/Makefile | 1 - + 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/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 | 1 - + drivers/tty/serial/samsung.c | 4 +- + drivers/tty/serial/serial-tegra.c | 158 +++-- + drivers/tty/serial/serial_core.c | 4 +- + 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 | 313 +++++----- + drivers/tty/serial/sirfsoc_uart.h | 100 ++-- + 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/sysrq.c | 19 +- + 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 | 2 + + include/linux/serial_core.h | 2 +- + include/linux/serial_sci.h | 86 +-- + include/linux/tty.h | 2 +- + include/uapi/linux/tty_flags.h | 2 +- + 77 files changed, 1447 insertions(+), 1454 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/arm_sbsa_uart.txt + delete mode 100644 drivers/tty/hvc/hvc_beat.c + delete mode 100644 drivers/tty/serial/msm_smd_tty.c +Merging usb/usb-next (2cfef79ddce4 cdc-acm: use swap() in acm_probe()) +$ git merge usb/usb-next +Removing include/linux/platform_data/usb-rcar-gen2-phy.h +Removing drivers/usb/phy/phy-rcar-gen2-usb.c +Auto-merging drivers/usb/phy/phy-ab8500-usb.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/usb/usb-ehci.txt | 2 + + drivers/usb/atm/speedtch.c | 18 +- + drivers/usb/atm/usbatm.c | 6 +- + drivers/usb/atm/xusbatm.c | 6 +- + drivers/usb/class/cdc-acm.c | 48 ++-- + drivers/usb/class/cdc-acm.h | 2 +- + drivers/usb/class/usblp.c | 15 +- + drivers/usb/core/buffer.c | 3 +- + drivers/usb/core/devio.c | 2 +- + drivers/usb/core/hcd.c | 3 +- + drivers/usb/core/hub.c | 40 ++-- + drivers/usb/gadget/legacy/inode.c | 9 +- + 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 | 5 - + drivers/usb/host/ehci-platform.c | 4 + + drivers/usb/host/ehci-tegra.c | 12 +- + 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-q.c | 3 +- + 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/musb_host.c | 9 +- + drivers/usb/phy/Kconfig | 13 -- + drivers/usb/phy/Makefile | 1 - + drivers/usb/phy/phy-ab8500-usb.c | 2 +- + drivers/usb/phy/phy-rcar-gen2-usb.c | 246 --------------------- + 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/platform_data/usb-rcar-gen2-phy.h | 22 -- + 53 files changed, 435 insertions(+), 565 deletions(-) + delete mode 100644 drivers/usb/phy/phy-rcar-gen2-usb.c + delete mode 100644 include/linux/platform_data/usb-rcar-gen2-phy.h +Merging usb-gadget/next (94a715ed5c57 usb: gadget: atmel: fix build warnings) +$ git merge usb-gadget/next +Recorded preimage for 'drivers/usb/musb/musb_core.c' +Auto-merging drivers/usb/phy/Kconfig +Auto-merging drivers/usb/musb/musb_host.c +Auto-merging drivers/usb/musb/musb_core.c +CONFLICT (content): Merge conflict in drivers/usb/musb/musb_core.c +Auto-merging drivers/usb/gadget/udc/s3c2410_udc.c +Auto-merging drivers/usb/gadget/udc/atmel_usba_udc.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/dwc3/core.h +Auto-merging drivers/phy/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/usb/renesas_usbhs.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/usb/musb/musb_core.c'. +[master 1bef0c803721] Merge remote-tracking branch 'usb-gadget/next' +$ git diff -M --stat --summary HEAD^.. + .../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/usb/gadget-testing.txt | 4 +- + MAINTAINERS | 7 + + drivers/phy/Kconfig | 7 + + drivers/phy/Makefile | 1 + + drivers/phy/phy-sun4i-usb.c | 9 + + drivers/phy/phy-tusb1210.c | 153 ++++ + drivers/phy/ulpi_phy.h | 31 + + drivers/power/twl4030_charger.c | 21 +- + drivers/usb/common/Makefile | 1 + + drivers/usb/common/ulpi.c | 255 +++++++ + drivers/usb/core/Kconfig | 20 + + 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 | 4 + + 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/udc/atmel_usba_udc.c | 6 +- + drivers/usb/gadget/udc/net2280.c | 140 +++- + drivers/usb/gadget/udc/s3c2410_udc.c | 28 +- + 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 | 78 ++- + 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 | 527 ++++++++------ + 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 | 3 +- + drivers/usb/phy/phy-msm-usb.c | 110 +++ + 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 +- + include/linux/mod_devicetable.h | 6 + + include/linux/phy/phy-sun4i-usb.h | 26 + + include/linux/ulpi/driver.h | 60 ++ + include/linux/ulpi/interface.h | 23 + + include/linux/ulpi/regs.h | 130 ++++ + 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 | 2 + + 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 + + 92 files changed, 3925 insertions(+), 1402 deletions(-) + 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 + create mode 100644 include/linux/phy/phy-sun4i-usb.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-serial/usb-next (e26081808eda Linux 4.1-rc4) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging staging/staging-next (f1a9983002cd staging: wilc1000: Include linux/gpio.h instead of asm/gpio.h) +$ git merge staging/staging-next +Auto-merging tools/Makefile +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/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/visorbus_private.h +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/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 +Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.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/config-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 29f4f948475f] 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/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/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 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 6 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 154 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 6 +- + drivers/staging/comedi/drivers/comedi_bond.c | 3 +- + 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/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/serial2002.c | 2 +- + drivers/staging/dgap/dgap.c | 131 +- + drivers/staging/dgnc/TODO | 6 +- + drivers/staging/dgnc/dgnc_cls.c | 4 +- + drivers/staging/dgnc/dgnc_neo.c | 4 +- + drivers/staging/dgnc/dgnc_tty.c | 106 +- + drivers/staging/emxx_udc/emxx_udc.c | 39 +- + drivers/staging/fbtft/Kconfig | 2 +- + 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/fwserial/dma_fifo.c | 2 +- + drivers/staging/fwserial/fwserial.h | 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 | 4 + + drivers/staging/lustre/lustre/fid/fid_request.c | 10 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 16 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 8 +- + .../staging/lustre/lustre/include/obd_support.h | 24 +- + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 10 +- + 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 | 14 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 10 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 12 +- + 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/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 | 4 - + drivers/staging/lustre/lustre/llite/llite_lib.c | 47 +- + 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/namei.c | 2 +- + drivers/staging/lustre/lustre/llite/rw26.c | 20 - + drivers/staging/lustre/lustre/llite/statahead.c | 21 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 6 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 4 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 30 +- + drivers/staging/lustre/lustre/lov/lov_dev.c | 19 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 5 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 22 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 18 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 35 +- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 4 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 6 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 2 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 31 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 20 +- + drivers/staging/lustre/lustre/obdclass/acl.c | 29 +- + 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 | 4 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 45 +- + drivers/staging/lustre/lustre/obdclass/llog.c | 25 +- + drivers/staging/lustre/lustre/obdclass/llog_obd.c | 4 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 14 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 6 +- + .../lustre/lustre/obdclass/lustre_handles.c | 2 +- + .../staging/lustre/lustre/obdclass/lustre_peer.c | 6 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 64 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 107 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 44 +- + drivers/staging/lustre/lustre/osc/osc_dev.c | 4 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 34 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 18 +- + drivers/staging/lustre/lustre/ptlrpc/connection.c | 6 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 44 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 30 +- + drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 6 +- + 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_plain.c | 11 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 96 +- + drivers/staging/media/bcm2048/radio-bcm2048.c | 4 +- + 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 | 52 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 2 + + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 2 + + drivers/staging/rtl8188eu/include/ieee80211.h | 29 +- + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 4 +- + 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 | 2 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 77 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 5 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 1496 ++-- + drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h | 908 --- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 11 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 20 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 825 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 9 + + drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 9 +- + drivers/staging/rtl8192e/rtllib.h | 39 - + drivers/staging/rtl8192e/rtllib_debug.h | 3 +- + drivers/staging/rtl8192e/rtllib_rx.c | 23 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 5 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 188 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 10 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 26 +- + 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/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_hal_init.c | 2 +- + 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/rts5208/rtsx.h | 25 +- + 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 | 4 +- + 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 | 49 +- + 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 | 57 +- + .../include/channels => visorbus}/vbuschannel.h | 2 +- + .../include => visorbus}/vbusdeviceinfo.h | 0 + drivers/staging/unisys/visorbus/visorbus_main.c | 1824 +++++ + .../visorchipset.h => visorbus/visorbus_private.h} | 136 +- + .../visorchannel.c} | 444 +- + .../visorchipset.c} | 1299 ++-- + .../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 - + .../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/device_main.c | 21 +- + drivers/staging/vt6655/mac.c | 49 +- + drivers/staging/vt6655/rxtx.c | 2 +- + drivers/staging/wilc1000/Kconfig | 55 + + drivers/staging/wilc1000/Makefile | 41 + + drivers/staging/wilc1000/TODO | 8 + + drivers/staging/wilc1000/coreconfigsimulator.h | 20 + + drivers/staging/wilc1000/coreconfigurator.c | 2201 ++++++ + drivers/staging/wilc1000/coreconfigurator.h | 498 ++ + drivers/staging/wilc1000/fifo_buffer.c | 142 + + drivers/staging/wilc1000/fifo_buffer.h | 23 + + drivers/staging/wilc1000/host_interface.c | 8074 ++++++++++++++++++++ + 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 | 2953 +++++++ + 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 | 510 ++ + drivers/staging/wilc1000/linux_wlan_spi.h | 14 + + drivers/staging/wilc1000/wilc_debugfs.c | 185 + + drivers/staging/wilc1000/wilc_errorsupport.h | 84 + + drivers/staging/wilc1000/wilc_event.h | 123 + + drivers/staging/wilc1000/wilc_exported_buf.c | 76 + + drivers/staging/wilc1000/wilc_log.h | 47 + + drivers/staging/wilc1000/wilc_memory.c | 63 + + drivers/staging/wilc1000/wilc_memory.h | 330 + + drivers/staging/wilc1000/wilc_msgqueue.c | 211 + + drivers/staging/wilc1000/wilc_msgqueue.h | 133 + + drivers/staging/wilc1000/wilc_osconfig.h | 55 + + drivers/staging/wilc1000/wilc_oswrapper.h | 133 + + drivers/staging/wilc1000/wilc_platform.h | 181 + + drivers/staging/wilc1000/wilc_sdio.c | 1298 ++++ + drivers/staging/wilc1000/wilc_semaphore.c | 70 + + drivers/staging/wilc1000/wilc_semaphore.h | 115 + + drivers/staging/wilc1000/wilc_sleep.c | 36 + + drivers/staging/wilc1000/wilc_sleep.h | 45 + + drivers/staging/wilc1000/wilc_spi.c | 1475 ++++ + drivers/staging/wilc1000/wilc_strutils.c | 431 ++ + drivers/staging/wilc1000/wilc_strutils.h | 412 + + drivers/staging/wilc1000/wilc_thread.c | 35 + + drivers/staging/wilc1000/wilc_thread.h | 153 + + drivers/staging/wilc1000/wilc_time.c | 163 + + drivers/staging/wilc1000/wilc_time.h | 205 + + drivers/staging/wilc1000/wilc_timer.c | 51 + + drivers/staging/wilc1000/wilc_timer.h | 153 + + drivers/staging/wilc1000/wilc_type.h | 34 + + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4592 +++++++++++ + drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 134 + + drivers/staging/wilc1000/wilc_wfi_netdevice.c | 960 +++ + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 277 + + drivers/staging/wilc1000/wilc_wlan.c | 2434 ++++++ + 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 +++ + include/linux/iio/iio.h | 3 + + include/linux/iio/types.h | 2 + + include/uapi/linux/iio/types.h | 2 + + tools/Makefile | 7 +- + tools/iio/Makefile | 4 +- + 417 files changed, 49548 insertions(+), 29380 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 + 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 + create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-mem.c + delete mode 100644 drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.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 + rename drivers/staging/unisys/{visorchipset/visorchipset.h => visorbus/visorbus_private.h} (52%) + rename drivers/staging/unisys/{visorchannel/visorchannel_funcs.c => visorbus/visorchannel.c} (61%) + rename drivers/staging/unisys/{visorchipset/visorchipset_main.c => visorbus/visorchipset.c} (70%) + 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_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 + 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_event.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_semaphore.c + create mode 100644 drivers/staging/wilc1000/wilc_semaphore.h + 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_thread.c + create mode 100644 drivers/staging/wilc1000/wilc_thread.h + create mode 100644 drivers/staging/wilc1000/wilc_time.c + create mode 100644 drivers/staging/wilc1000/wilc_time.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 +Merging char-misc/char-misc-next (039ae58503f3 hwmon: Allow to compile dell-smm-hwmon driver without /proc/i8k) +$ git merge char-misc/char-misc-next +Auto-merging scripts/mod/file2alias.c +Auto-merging scripts/mod/devicetable-offsets.c +Auto-merging include/linux/mod_devicetable.h +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 arch/x86/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + 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/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 | 4 +- + arch/um/os-Linux/drivers/ethertap_user.c | 2 +- + arch/x86/Kconfig | 25 +- + drivers/char/Kconfig | 8 - + drivers/char/Makefile | 2 - + drivers/char/misc.c | 10 +- + drivers/char/msm_smd_pkt.c | 465 ---- + drivers/char/virtio_console.c | 4 +- + drivers/char/xillybus/Kconfig | 2 +- + drivers/hv/Makefile | 2 +- + drivers/hv/channel.c | 13 +- + drivers/hv/channel_mgmt.c | 124 +- + drivers/hv/connection.c | 5 + + 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/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 | 155 +- + 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/pcmcia/cs.c | 10 +- + drivers/platform/goldfish/goldfish_pipe.c | 2 +- + drivers/spmi/Kconfig | 1 + + drivers/uio/uio.c | 3 +- + drivers/w1/slaves/w1_therm.c | 162 +- + drivers/w1/w1.c | 17 +- + include/linux/hyperv.h | 39 +- + include/linux/mei_cl_bus.h | 38 +- + include/linux/mod_devicetable.h | 13 + + 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 | 18 +- + tools/hv/hv_fcopy_daemon.c | 15 + + tools/hv/hv_kvp_daemon.c | 166 +- + tools/hv/hv_vss_daemon.c | 149 +- + 128 files changed, 13833 insertions(+), 4895 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/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/mei_fix_up_uuid_matching.patch +Applying: mei: fix up uuid matching +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/misc/mei/bus.c +M drivers/nfc/mei_phy.h +M include/linux/mod_devicetable.h +M scripts/mod/file2alias.c +$ git add -A . +$ git commit -v -a --amend +[master 763e66a39202] Merge remote-tracking branch 'char-misc/char-misc-next' + Date: Thu May 28 18:48:21 2015 +1000 +Merging extcon/extcon-next (046050f6e623 extcon: Update the prototype of extcon_register_notifier() with enum extcon) +$ git merge extcon/extcon-next +Recorded preimage for 'include/dt-bindings/mfd/arizona.h' +Resolved 'include/linux/mfd/axp20x.h' using previous resolution. +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 Documentation/devicetree/bindings/mfd/arizona.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/dt-bindings/mfd/arizona.h'. +[master dfa1eb274ed7] Merge remote-tracking branch 'extcon/extcon-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/mfd/arizona.txt | 6 + + 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 | 308 +++++++++-------- + drivers/usb/phy/phy-tahvo.c | 9 +- + include/dt-bindings/mfd/arizona.h | 4 + + include/linux/extcon.h | 139 ++++---- + include/linux/extcon/extcon-adc-jack.h | 5 +- + include/linux/mfd/arizona/pdata.h | 3 + + include/linux/mfd/axp20x.h | 5 + + 22 files changed, 885 insertions(+), 602 deletions(-) + create mode 100644 drivers/extcon/extcon-axp288.c +$ git am -3 ../patches/0001-power-axp288_charger-fix-for-AIP-change.patch +Applying: power: axp288_charger: fix for AIP change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/power/axp288_charger.c +$ git add -A . +$ git commit -v -a --amend +[master c39446696157] Merge remote-tracking branch 'extcon/extcon-next' + Date: Thu May 28 19:05:33 2015 +1000 +Merging kdbus/kdbus (9fb9cd0f4434 kdbus: avoid the use of struct timespec) +$ git merge kdbus/kdbus +Resolved 'Documentation/Makefile' using previous resolution. +Auto-merging tools/testing/selftests/Makefile +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/magic.h +Auto-merging include/uapi/linux/Kbuild +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/ioctl/ioctl-number.txt +Auto-merging Documentation/Makefile +CONFLICT (content): Merge conflict in Documentation/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 86552c3f171c] Merge remote-tracking branch 'kdbus/kdbus' +$ git diff -M --stat --summary HEAD^.. + 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 | 560 ++++++ + ipc/kdbus/bus.h | 101 + + ipc/kdbus/connection.c | 2214 +++++++++++++++++++++ + 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 | 617 ++++++ + ipc/kdbus/handle.h | 85 + + ipc/kdbus/item.c | 339 ++++ + ipc/kdbus/item.h | 64 + + ipc/kdbus/limits.h | 64 + + ipc/kdbus/main.c | 125 ++ + ipc/kdbus/match.c | 559 ++++++ + ipc/kdbus/match.h | 35 + + ipc/kdbus/message.c | 616 ++++++ + ipc/kdbus/message.h | 133 ++ + ipc/kdbus/metadata.c | 1159 +++++++++++ + ipc/kdbus/metadata.h | 57 + + ipc/kdbus/names.c | 772 +++++++ + ipc/kdbus/names.h | 74 + + ipc/kdbus/node.c | 910 +++++++++ + ipc/kdbus/node.h | 84 + + 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 | 257 +++ + ipc/kdbus/reply.h | 68 + + ipc/kdbus/util.c | 201 ++ + ipc/kdbus/util.h | 74 + + 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 | 1326 ++++++++++++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/kdbus/.gitignore | 1 + + tools/testing/selftests/kdbus/Makefile | 48 + + tools/testing/selftests/kdbus/kdbus-enum.c | 94 + + tools/testing/selftests/kdbus/kdbus-enum.h | 14 + + tools/testing/selftests/kdbus/kdbus-test.c | 923 +++++++++ + tools/testing/selftests/kdbus/kdbus-test.h | 85 + + 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-attach-flags.c | 750 +++++++ + 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 | 616 ++++++ + tools/testing/selftests/kdbus/test-daemon.c | 65 + + tools/testing/selftests/kdbus/test-endpoint.c | 341 ++++ + 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 + + 97 files changed, 34069 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-attach-flags.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 (b5ba75b5fc0e cgroup: simplify threadgroup locking) +$ 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 +Merge made by the 'recursive' strategy. + include/linux/cgroup-defs.h | 497 ++++++++++++++++++++ + include/linux/cgroup.h | 1051 ++++++++++++------------------------------- + include/linux/init_task.h | 8 - + include/linux/sched.h | 65 +-- + init/Kconfig | 1 + + kernel/cgroup.c | 114 ++--- + kernel/fork.c | 4 - + 7 files changed, 859 insertions(+), 881 deletions(-) + create mode 100644 include/linux/cgroup-defs.h +Merging scsi/for-next (d56dfb41f535 be2iscsi : Bump the driver version) +$ git merge scsi/for-next +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 +Merge made by the 'recursive' strategy. + drivers/scsi/aacraid/src.c | 2 +- + 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/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/megaraid/megaraid_sas.h | 340 +++++++------- + drivers/scsi/megaraid/megaraid_sas_base.c | 662 +++++++++++++--------------- + drivers/scsi/megaraid/megaraid_sas_fp.c | 17 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 551 +++++++++++------------ + drivers/scsi/megaraid/megaraid_sas_fusion.h | 281 ++++++------ + drivers/scsi/scsi_scan.c | 3 +- + drivers/scsi/sd.c | 3 +- + drivers/scsi/ufs/Kconfig | 2 +- + 22 files changed, 1123 insertions(+), 1013 deletions(-) +Merging target-updates/for-next (9cfc3ea41c4f loopback: Enable TFO->complete_irq for fast-path ->scsi_done) +$ git merge target-updates/for-next +Removing include/target/target_core_backend_configfs.h +Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c +Auto-merging drivers/infiniband/ulp/isert/ib_isert.c +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 | 233 +---- + 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 | 270 +----- + drivers/target/sbp/sbp_target.h | 11 +- + drivers/target/target_core_alua.c | 396 +++----- + drivers/target/target_core_alua.h | 14 +- + drivers/target/target_core_configfs.c | 771 ++++++++++++--- + drivers/target/target_core_device.c | 1197 +++++------------------- + 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 | 64 +- + drivers/target/target_core_pr.c | 357 ++++--- + 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 | 544 ++++------- + drivers/target/target_core_transport.c | 391 ++++---- + drivers/target/target_core_ua.c | 52 +- + drivers/target/target_core_user.c | 279 +++--- + drivers/target/target_core_xcopy.c | 40 +- + 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 | 225 +---- + 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 | 59 +- + include/target/target_core_fabric.h | 66 +- + lib/crc-t10dif.c | 12 +- + 65 files changed, 3034 insertions(+), 6154 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 (bb1b6503dff1 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-atlas7.txt | 50 + + .../bindings/pinctrl/img,pistachio-pinctrl.txt | 217 + + .../bindings/pinctrl/nxp,lpc1850-scu.txt | 57 + + .../devicetree/bindings/pinctrl/pinctrl-atlas7.txt | 109 + + .../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 9 +- + .../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-cygnus-gpio.c | 4 +- + drivers/pinctrl/core.c | 2 +- + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx.c | 55 +- + drivers/pinctrl/freescale/pinctrl-imx7d.c | 385 ++ + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 263 ++ + drivers/pinctrl/mediatek/Kconfig | 13 + + drivers/pinctrl/mediatek/Makefile | 2 + + drivers/pinctrl/mediatek/pinctrl-mt6397.c | 78 + + drivers/pinctrl/mediatek/pinctrl-mt8127.c | 359 ++ + drivers/pinctrl/mediatek/pinctrl-mt8135.c | 12 +- + drivers/pinctrl/mediatek/pinctrl-mt8173.c | 369 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 155 +- + 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/nomadik/pinctrl-abx500.c | 1 + + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 62 +- + drivers/pinctrl/pinctrl-adi2.c | 1 + + drivers/pinctrl/pinctrl-at91.c | 16 + + drivers/pinctrl/pinctrl-lpc18xx.c | 1220 +++++ + drivers/pinctrl/pinctrl-pistachio.c | 1504 +++++++ + drivers/pinctrl/pinctrl-single.c | 2 +- + drivers/pinctrl/pinctrl-zynq.c | 72 +- + drivers/pinctrl/pinmux.c | 13 + + 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 | 148 + + drivers/pinctrl/sirf/Makefile | 1 + + drivers/pinctrl/sirf/pinctrl-atlas7.c | 4639 ++++++++++++++++++++ + include/dt-bindings/pinctrl/mt6397-pinfunc.h | 256 ++ + include/linux/pinctrl/consumer.h | 2 +- + include/linux/pinctrl/pinmux.h | 4 + + 55 files changed, 11753 insertions(+), 329 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 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/sirf/pinctrl-atlas7.c + create mode 100644 include/dt-bindings/pinctrl/mt6397-pinfunc.h +Merging vhost/linux-next (f4aaa799cf9a 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 +Merge made by the 'recursive' strategy. + drivers/net/macvtap.c | 2 +- + drivers/net/tun.c | 2 +- + drivers/pci/msi.c | 4 ++-- + drivers/pci/pci-driver.c | 2 -- + include/linux/pci.h | 4 ---- + 5 files changed, 4 insertions(+), 10 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 (1ab4363bd9fb Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging include/linux/gpio/consumer.h +Auto-merging include/linux/acpi.h +Auto-merging drivers/gpio/gpio-bcm-kona.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/brcm,brcmstb-gpio.txt | 65 +++ + .../devicetree/bindings/gpio/gpio-xlp.txt | 47 ++ + .../devicetree/bindings/gpio/nxp,lpc1850-gpio.txt | 39 ++ + Documentation/gpio/gpio-legacy.txt | 9 - + Documentation/gpio/sysfs.txt | 8 - + Documentation/zh_CN/gpio.txt | 8 - + drivers/gpio/Kconfig | 21 +- + drivers/gpio/Makefile | 2 + + drivers/gpio/gpio-bcm-kona.c | 26 +- + drivers/gpio/gpio-crystalcove.c | 1 + + drivers/gpio/gpio-dln2.c | 1 - + drivers/gpio/gpio-generic.c | 22 +- + drivers/gpio/gpio-lpc18xx.c | 180 +++++++ + 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 | 24 + + drivers/gpio/gpio-ts5500.c | 2 +- + drivers/gpio/gpio-xgene-sb.c | 1 - + drivers/gpio/gpio-xilinx.c | 4 +- + drivers/gpio/gpio-xlp.c | 427 ++++++++++++++++ + drivers/gpio/gpiolib-acpi.c | 29 ++ + drivers/gpio/gpiolib-sysfs.c | 567 ++++++++++----------- + drivers/gpio/gpiolib.c | 25 +- + drivers/gpio/gpiolib.h | 16 +- + drivers/i2c/i2c-core.c | 12 +- + 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 | 6 - + include/linux/gpio/driver.h | 13 +- + include/linux/platform_data/gpio-omap.h | 12 +- + 34 files changed, 1209 insertions(+), 423 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.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-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 (14d419c079ab mnt: Update fs_fully_visible to test for permanently empty directories) +$ git merge userns/for-next +Resolved 'fs/libfs.c' using previous resolution. +Auto-merging security/smack/smackfs.c +Auto-merging kernel/cgroup.c +Auto-merging 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 +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9ab5651e8af3] 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 | 4 +- + 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, 348 insertions(+), 90 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 (5343325ff3dd clk: socfpga: add a clock driver for the Arria 10 platform) +$ git merge clk/clk-next +Auto-merging include/linux/clk-provider.h +Auto-merging drivers/clk/clk.c +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +Merge made by the 'recursive' strategy. + 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 + + .../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 + + arch/arm/boot/dts/atlas7.dtsi | 15 + + drivers/clk/Kconfig | 2 +- + drivers/clk/Makefile | 1 + + 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-composite.c | 6 +- + drivers/clk/clk-conf.c | 7 +- + drivers/clk/clk-divider.c | 6 +- + drivers/clk/clk-fixed-factor.c | 4 +- + 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 | 1928 ++++++++++---------- + drivers/clk/hisilicon/clk-hix5hd2.c | 5 +- + 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/mmp/Makefile | 2 + + drivers/clk/mmp/clk-apbc.c | 2 +- + drivers/clk/mmp/clk-apmu.c | 2 +- + drivers/clk/mmp/clk-of-pxa1928.c | 265 +++ + drivers/clk/rockchip/clk-rk3188.c | 2 +- + drivers/clk/rockchip/clk-rk3288.c | 2 +- + drivers/clk/samsung/clk-exynos5260.c | 100 +- + drivers/clk/samsung/clk-exynos5420.c | 10 +- + drivers/clk/samsung/clk-s3c2410-dclk.c | 6 +- + drivers/clk/samsung/clk.c | 2 +- + 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 | 6 +- + 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.c | 7 +- + drivers/clk/socfpga/clk.h | 11 +- + drivers/clk/st/clk-flexgen.c | 6 +- + drivers/clk/st/clkgen-fsyn.c | 4 +- + drivers/clk/st/clkgen-mux.c | 14 +- + drivers/clk/st/clkgen-pll.c | 10 +- + drivers/clk/ti/clk-dra7-atl.c | 9 +- + drivers/clk/ti/clk.c | 4 +- + 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 +- + include/dt-bindings/clock/marvell,pxa1928.h | 57 + + 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 | 10 +- + 85 files changed, 6800 insertions(+), 1210 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/csr,atlas7-car.txt + create mode 100644 Documentation/devicetree/bindings/clock/marvell,pxa1928.txt + 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/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/marvell,pxa1928.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 a052c94998ff] 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 (bc1cdfd17466 Merge branch 'for-4.2/upstream' into for-next) +$ git merge livepatching/for-next +Auto-merging arch/x86/kernel/setup.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 | 78 +++++++++++++++++++++++--------------- + 6 files changed, 66 insertions(+), 33 deletions(-) +Merging coresight/next (486ea46dfc88 coresight-etm3x: Add Qualcomm PTM v1.1 peripheral ID) +$ git merge coresight/next +Recorded preimage for 'drivers/hwtracing/coresight/coresight-etm3x.c' +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 +Recorded resolution for 'drivers/hwtracing/coresight/coresight-etm3x.c'. +[master 2df260ca4359] 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 (f1644dff27ab rtc: rtc-v3020: use gpio_request_array()) +$ 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 | 7 + + drivers/mfd/mt6397-core.c | 18 ++ + drivers/rtc/Kconfig | 11 + + drivers/rtc/Makefile | 1 + + drivers/rtc/interface.c | 4 +- + drivers/rtc/rtc-ab8500.c | 2 +- + drivers/rtc/rtc-at32ap700x.c | 2 +- + drivers/rtc/rtc-ds1672.c | 1 + + drivers/rtc/rtc-efi.c | 4 +- + drivers/rtc/rtc-ep93xx.c | 6 +- + 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-s3c.c | 14 +- + drivers/rtc/rtc-v3020.c | 41 +--- + include/linux/rtc.h | 11 +- + 22 files changed, 845 insertions(+), 120 deletions(-) + create mode 100644 drivers/rtc/rtc-mt6397.c +$ git revert bb5530e40824 +[master c58f9783447d] Revert "crypto: jitterentropy - add jitterentropy RNG" + 4 files changed, 925 deletions(-) + delete mode 100644 crypto/jitterentropy.c +$ git am -3 ../patches/0001-try-putting-the-include-of-vmalloc.h-back-into-inet_.patch +Applying: try putting the include of vmalloc.h back into inet_hashtables.h +Merging akpm-current/current (2201268393aa scsi-resolve-sg-buffer-const-ness-issue-fix) +$ git merge --no-ff akpm-current/current +Resolved 'arch/x86/kernel/machine_kexec_64.c' using previous resolution. +Resolved 'drivers/staging/android/lowmemorykiller.c' using previous resolution. +Auto-merging mm/shmem.c +Auto-merging mm/page_alloc.c +Auto-merging mm/memory.c +Auto-merging lib/radix-tree.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging kernel/sysctl.c +Auto-merging kernel/sched/wait.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/mm_types.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/gfp.h +Removing include/linux/compiler-gcc5.h +Removing include/linux/compiler-gcc4.h +Removing include/linux/compiler-gcc3.h +Auto-merging fs/proc/base.c +Auto-merging fs/coredump.c +Auto-merging fs/cifs/file.c +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 block/genhd.c +Auto-merging arch/x86/kernel/process_64.c +Auto-merging arch/x86/kernel/process_32.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/ia32/ia32entry.S +Auto-merging arch/x86/Kconfig +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 +Auto-merging CREDITS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 075861a0459c] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 2 + + CREDITS | 4 + + .../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/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/userfaultfd.txt | 144 +++ + MAINTAINERS | 29 +- + 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 | 4 - + 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 | 4 - + 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 | 4 - + 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 | 4 - + 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 | 4 - + 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/dma-default.c | 30 +- + 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 | 5 - + 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 | 1 - + arch/s390/include/asm/mm-arch-hooks.h | 15 + + arch/s390/include/asm/pgtable.h | 30 +- + arch/s390/kernel/compat_wrapper.c | 2 +- + arch/s390/mm/hugetlbpage.c | 5 - + arch/score/include/asm/mm-arch-hooks.h | 15 + + arch/sh/include/asm/hugetlb.h | 3 - + arch/sh/include/asm/mm-arch-hooks.h | 15 + + arch/sh/mm/hugetlbpage.c | 5 - + arch/sparc/include/asm/hugetlb.h | 4 - + 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/tile/include/asm/hugetlb.h | 4 - + 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 | 2 + + arch/x86/ia32/ia32entry.S | 2 +- + arch/x86/include/asm/hugetlb.h | 3 - + arch/x86/include/asm/mm-arch-hooks.h | 15 + + arch/x86/include/asm/pgtable.h | 9 +- + arch/x86/kernel/kexec-bzimage64.c | 11 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/process_32.c | 6 +- + arch/x86/kernel/process_64.c | 8 +- + arch/x86/syscalls/syscall_32.tbl | 1 + + arch/x86/syscalls/syscall_64.tbl | 1 + + 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/node.c | 6 +- + drivers/block/zram/Kconfig | 10 +- + drivers/block/zram/zcomp.c | 2 +- + drivers/block/zram/zram_drv.c | 1028 +++++++++------- + drivers/block/zram/zram_drv.h | 10 +- + drivers/md/bcache/journal.c | 2 +- + 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 +- + 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/binfmt_elf.c | 2 +- + 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/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 | 11 +- + fs/jbd2/transaction.c | 20 +- + fs/minix/inode.c | 2 +- + fs/mpage.c | 23 +- + fs/ntfs/malloc.h | 7 +- + fs/ocfs2/alloc.c | 282 +++-- + fs/ocfs2/aops.c | 58 +- + 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 | 31 +- + fs/ocfs2/inode.c | 40 +- + 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 | 2 + + 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/omfs/bitmap.c | 2 +- + fs/omfs/inode.c | 10 +- + fs/posix_acl.c | 46 +- + fs/proc/array.c | 8 + + fs/proc/base.c | 204 +++- + fs/proc/task_mmu.c | 2 + + fs/reiserfs/super.c | 3 +- + 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/gfp.h | 8 + + include/linux/huge_mm.h | 4 + + include/linux/kernel.h | 3 + + include/linux/kexec.h | 2 + + include/linux/memblock.h | 18 + + 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 | 1 + + include/linux/swap.h | 1 + + include/linux/syscalls.h | 7 +- + include/linux/userfaultfd_k.h | 85 ++ + include/linux/vm_event_item.h | 1 + + include/linux/wait.h | 5 +- + include/ras/ras_event.h | 85 ++ + include/trace/events/kmem.h | 54 +- + include/uapi/asm-generic/mman-common.h | 1 + + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/userfaultfd.h | 161 +++ + init/Kconfig | 11 + + init/main.c | 2 + + ipc/msg.c | 5 +- + ipc/util.c | 5 +- + kernel/exit.c | 4 +- + kernel/fork.c | 51 +- + kernel/kexec.c | 11 + + kernel/panic.c | 5 +- + kernel/printk/printk.c | 214 ++-- + kernel/sched/wait.c | 7 +- + kernel/smpboot.c | 60 +- + kernel/sys_ni.c | 1 + + kernel/sysctl.c | 7 + + kernel/watchdog.c | 67 +- + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/bitmap.c | 32 +- + lib/crc64_ecma.c | 341 ++++++ + lib/radix-tree.c | 28 +- + lib/scatterlist.c | 18 +- + lib/sort.c | 23 +- + lib/test-hexdump.c | 6 +- + lib/vsprintf.c | 20 +- + mm/Kconfig | 19 + + mm/Makefile | 1 + + mm/bootmem.c | 13 +- + mm/compaction.c | 25 +- + mm/filemap.c | 31 +- + mm/huge_memory.c | 134 +- + mm/hugetlb.c | 77 +- + mm/hwpoison-inject.c | 4 +- + mm/internal.h | 11 +- + mm/kasan/kasan.h | 1 - + mm/ksm.c | 2 +- + mm/madvise.c | 179 ++- + mm/memblock.c | 34 +- + mm/memcontrol.c | 20 +- + mm/memory-failure.c | 353 +++--- + mm/memory.c | 28 +- + mm/memory_hotplug.c | 11 +- + mm/mempolicy.c | 4 +- + mm/migrate.c | 13 +- + mm/mlock.c | 3 +- + mm/mm_init.c | 9 +- + mm/mmap.c | 40 +- + mm/mprotect.c | 14 +- + mm/mremap.c | 17 +- + mm/nobootmem.c | 7 +- + mm/nommu.c | 112 +- + mm/oom_kill.c | 156 +-- + 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/zsmalloc.c | 4 - + mm/zswap.c | 4 +- + net/sunrpc/sched.c | 2 +- + scripts/checkpatch.pl | 51 +- + scripts/gdb/linux/dmesg.py | 1 - + scripts/gdb/linux/lists.py | 92 ++ + scripts/gdb/linux/modules.py | 9 +- + 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 + + 309 files changed, 8181 insertions(+), 2945 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: arch/x86/kvm/mmu.c: work around gcc-4.4.4 bug +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: 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 + + f5394abd3d41...a8d618f47f32 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (a8d618f47f32 drivers/w1/w1_int.c: call put_device if device_register fails) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/unicore32/kernel/fpu-ucf64.c | 4 +- + arch/x86/kvm/mmu.c | 14 ++--- + 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/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 +- + 18 files changed, 71 insertions(+), 121 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..e6645d17863b --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 4.1-rc2 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.1-rc1 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..4499b72fb472 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20150528 |