diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-03-16 18:08:07 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-03-16 18:08:07 +1100 |
| commit | 159e7763d517804c61a673736660a5a35f2ea5f8 (patch) | |
| tree | cf122e754fee5a1c4083b0c3d2be09ed2e632522 | |
| parent | c272bc312446c3f3511e81b4eb721159b9813180 (diff) | |
| download | linux-159e7763d517804c61a673736660a5a35f2ea5f8.tar.gz linux-159e7763d517804c61a673736660a5a35f2ea5f8.tar.xz | |
Add linux-next specific files for 20150316next-20150316
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 212 | ||||
| -rw-r--r-- | Next/Trees | 214 | ||||
| -rw-r--r-- | Next/merge.log | 6388 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 6817 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..0f6ce6e6dbe7 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,212 @@ +Name SHA1 +---- ---- +origin 08352086de06c95f4bd9a56cd03b231919bf9627 +fixes b94d525e58dc9638dd3f98094cb468bcfb262039 +kbuild-current c517d838eb7d07bbe9507871fab3931deccff539 +arc-current 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd +arm-current 6d021b724481fbb908eb29384898deb9f00dfe70 +m68k-current 4436820a98cdaf497a874323095e328831030956 +metag-fixes c2996cb29bfb73927a79dc96e598a718e843f01a +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-merge c517d838eb7d07bbe9507871fab3931deccff539 +powerpc-merge-mpe 4ad04e5987115ece5fa8a0cf1dc72fcd4707e33e +sparc 53eb2516972b8c4628651dfcb926cb9ef8b2864a +net 4c906c279886550d2aaac6facf71d709158e4e3c +ipsec ac37e2515c1a89c477459a2020b6bfdedabdb91b +sound-current ef403edb75580a3ec5d155f5de82155f0419c621 +pci-current bc3b5b47c80da8838758731d423179262c9c36ec +wireless-drivers 3f1615340acea54e21f4b9d4d65921540dca84b2 +driver-core.current c517d838eb7d07bbe9507871fab3931deccff539 +tty.current 7fd6f640f2dd17dac6ddd6702c378cb0bb9cfa11 +usb.current 963ffa3e97d4011cbc545d4236179f227e199f3f +usb-gadget-fixes 2c247804796bbcaa90087f2196f68fdc20a5fe04 +usb-serial-fixes 9eccca0843205f87c00404b663188b88eb248051 +staging.current 1f51d5801859e0b382dcc8f06875811d63ec8953 +char-misc.current 3d7a8278fdfdea5be4c647853171a0df5d13c1d3 +input-current 4eb8d6e7e5aa14572bc389e554aad9869188cdcd +crypto-current ccfe8c3f7e52ae83155cb038753f4c75b774ca8a +ide f96fe225677b3efb74346ebd56fafe3997b02afa +devicetree-current 6b1271de3723a7957c7cc6a7f36ea114f557e730 +rr-fixes f476893459318cb2eff3ecd2a05d4ceacf82e73e +vfio-fixes ec76f4007079469e86e2e44c3e5d1d11086de9d6 +kselftest-fixes 9a0b57451ae8142c74d65bddb6d7765818babbed +drm-intel-fixes 2dccc9898d45cd552f372c3f0b4a7f42126312f1 +asm-generic 643165c8bbc8617d8222cb50c89e34fe64d226cf +arc 9eccca0843205f87c00404b663188b88eb248051 +arm e163910f8e33e0f63b4311f6e059b878ef8fd192 +arm-perf 97bf6af1f928216fd6c5a66e8a57bfa95a659672 +arm-soc da55c5297d445a7cca6f8585e96c1529956a0f60 +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +rpi 72a6dbe0ea91e2a9c4357a3b0afbbd7b1f00dc8a +berlin c517d838eb7d07bbe9507871fab3931deccff539 +cortex-m e799b6f37e6ccd7b97e3e2df62a30f1c5b211290 +imx-mxs bb4362858cc6d991649870989c9d0fee74a27377 +keystone b17275a4a6cc61e0b7da40558ff5c7250fb80917 +mvebu 86df292febc075c6c1b724c2a01aaef25584da14 +omap 67fd14b3eca63b14429350e9eadc5fab709a8821 +omap-pending 30aa18d3bea5f9470af5aa48ab8df88bde97c795 +renesas 845e70e34f9c1521ed26a9c49c020e4b0fac57b2 +samsung e0e94a5fb27a1d37d4c0b5626c18263429d2358d +sunxi 0d63d060aa18523daa28dbbfc24b136a83f84687 +tegra 7f2674cb733c76781ae0c7479bb36c32701883e4 +arm64 d476d94f180af3f0fca77394651d4a98f4df1c54 +blackfin 275f5a8573e7832d0cf344a1b29da357c7038870 +c6x 3591276d16f8e568449e4b6c719165ad2decf222 +cris a38ecbbd0be025a6ecbbfd22d2575a5b46317117 +hexagon 8914d7e857807e1e60975000cba3750c9b2643e8 +ia64 a6b8978c54b771308f6f1692b9735ac0bb087cc2 +m68k 79bf442c79d67f509060b009ebc55795e918006a +m68knommu df73d16fadd7a7df32cb74f64dd5153f25834f9d +metag f93125ae17d1d259b5aba84016db260903822194 +microblaze c2219eda547813c0c50dba90d9e989ae36cc3ab8 +mips 1e20959e3c05595dfea7290b8290b6265e326f47 +nios2 92d5dd8cd6e2b211d32d8fbc6cf4b7470765a09f +parisc-hd 64fa6213c7162a5bf1e89570eec79edebd3f91db +powerpc c517d838eb7d07bbe9507871fab3931deccff539 +powerpc-mpe a6130ed253a931d2169c26ab0958d81b0dce4d6e +fsl 0dc294f717d41bfbafc746a7a96a7bc0f114c20c +mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +s390 6fbfcc3fd01fdda506b2e472c43480cb0a61949d +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 740e1433f50e6d0f1c4705c1a963645072f5a74c +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 1f2fdbd0078cb2ad4251768e8c0e0bb652a2cbd6 +btrfs a742994aa2e271eb8cd8e043d276515ec858ed73 +ceph 388cfdc9bc19cc189b86770dba55910018e8e0fc +cifs 121672682b23492649ad5997359a9a87df36ca3f +ecryptfs 6d65261a09adaa374c05de807f73a144d783669e +ext3 6981498d7956e3177b6f74926aa4a5c2a45b4edb +ext4 6f30b7e37a8239f9d27db626a1d3427bc7951908 +f2fs ee2383f796e03d6361334fe87b20dca1ef3f3fdb +fscache 1a8ed18fb7db48c916c2ccd484e04bd4dd737834 +fuse 6a57f2a7bb7deb65e74c477a39f9216b07887d9d +gfs2 89d4899e65a7e368cf90854805402fac548ecbb3 +jfs 7d2ac45611b072a24e5014a56a65e6be31c1f884 +nfs 9eccca0843205f87c00404b663188b88eb248051 +nfsd c517d838eb7d07bbe9507871fab3931deccff539 +overlayfs 4330397e4e8a662f36d101659e2a59ce32e76ff4 +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs f15844e0777fec936f87a87f97394f83911dacd3 +ubifs b388e6a7a6ba988998ddd83919ae8d3debf1a13d +xfs 88e8fda99a4c99a1a6482510655dbd88cccd221b +file-locks 65782c7629bdbbc7d014c5b85310d22d022b56f7 +vfs 074def59bce487ad059ecd6a71a0509cc8191ae8 +pci c517d838eb7d07bbe9507871fab3931deccff539 +hid 1034f72defefc2beae044fc94f5ac9566aa69d26 +i2c 58b59e0f2462780ae3978611519f6a5e477e31df +jdelvare-hwmon 26bc420b59a38e4e6685a73345a0def461136dce +hwmon-staging f6906edeac16bb33b80d41fac84261767f18c14a +v4l-dvb 48b777c0833bc7392679405539bb5d3ed0900828 +kbuild 94100b52d1c03cded6564f0939780ae39805e07e +kconfig bfa76d49576599a4b9f9b7a71f23d73d6dcff735 +libata 29200f12a1167076346415e18eee9065cb77a859 +pm 1983638243b996af80f3e1f22a418cd120c8d5fd +idle 210109f4a19ad6a0a883d9bfc763228ac65a6671 +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +thermal 5912e264d9eec512598d8faf33440630a3aee989 +thermal-soc 3d1b493e988602ed27282ee747399e5e6087274a +ieee1394 d71e6a11737f4b3d857425a1d6f893231cbd1296 +dlm 2ab4bd8ea3a6954bc79a9bbeb291cd6c2d6213a7 +swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8 +slave-dma 013489fea669c7f9a92698e47b3073f70e059faf +net-next 5a2f78dd51d9d71aa40cb752af88332f45c884b7 +ipsec-next 74005991b78a0a7a6546004fb37d33a651c613e7 +wireless-drivers-next 6029e0c59b1c80b9669717f055b65588bde9754e +bluetooth 4f0f155ceaf7e1b59d210a8afb24d4ea63ce13cc +infiniband 147d1da951cf067badb7d3585002e1eb46719f83 +mtd 5e0899db69e27abfdc1c6223ca74f479acdedaa6 +l2-mtd 7234bea69de200e2060d099685c4c674b556edc0 +crypto 05713ba9055f1a209d50e480626f36c401bda3ad +drm 03be70050c85768e9ce7c0d0887110d1b629e127 +drm-panel 23923ebaac52884829118a4ff2e963ec61136d45 +drm-intel e81918499f060fe35ee12298e66fbfc2c6159b19 +drm-tegra 07d05cbf60ed8f06c61484d3d85c06c1aa7edf38 +drm-misc 43fc884efe20bcc0fae60d8212c6e66426a3d8b0 +drm-exynos 917d67900576c17cd6e191cd01832caeea1bea3f +sound e79d74ab25339437447478e4dfe2b35c5b560512 +sound-asoc a62354bfc44ee34f95fcbc991f5221a31b94c65a +modules 6587457b4b3d663b237a0f95ddf6e67d1828c8ea +virtio cf02b2c2d1a12f8fd8f0ecc7c0b72a35462bc286 +input f13b2065de8147a1652b830ea5db961cf80c09df +block bfd343aa1718457d34b99ce6573085ac340da288 +device-mapper 026a558f2ba599bda37ded1cdbebf451a9c9d553 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh fb0ed6021cbcff54ac1aa16d1d7e9c00cc57ead3 +kgdb 2d289f14f00a0da6bae7c8415fc8dd9d030458b8 +md 4400755e356f9a2b0b7ceaa02f57b1c7546c3765 +mfd f2c23396d6e793757c9d876f235d147cb4910356 +backlight 1926469377bb20d20662fc505b6b36f43b412381 +battery 0595439a0a8740f776a0ae367a4c7f243add24ec +omap_dss2 72fc8b7187cd846be08d3bc0fec9380fdad29b45 +regulator 0609baa58e3af47e2b7551b7bb586524b9e10f56 +security 74f0414b2f9a6b12df208a69baa21e22178a2463 +integrity 7bea7ff67e0cbb30f53ebee7194e238491ddeaab +selinux 1cad16744b212c72b135ca27b1c1be206fb71e37 +lblnet b2776bf7149bddd1f4161f14f79520f17fc1d71d +watchdog c517d838eb7d07bbe9507871fab3931deccff539 +iommu eccd732182ce85e16a6a1c1e04f5bdf3844e73f5 +dwmw2-iommu 1860e379875dfe7271c649058aeddffe5afd9d0d +vfio 6140a8f5623820cec7f56c63444b9551d8d35775 +osd 1fa3a002b2546c42c343c77c144871285896ced5 +jc_docs b0e1ee8e1405ae033a0eac01ead275e65e4e6831 +trivial 0e4f93e5017d9d8080bbd34db17836e090eb46fe +audit 724e7bfcc566375158219c1454b4b6fc416b2c4a +devicetree fca8ba4ee24d17f8845ed1c8edcc3fd81c4650c2 +dt-rh a697c2efba03ac7bfdbffbba7f0f1aa294f7dee0 +mailbox 33350e6b1833b15cf9c9c4c84d8534ad68b0c7b8 +spi ac5b718e03d46fd5bd89a9c4c34193880ba0a6a5 +tip ba518c0a33adb5e939a58cae3124a9ae56d65452 +clockevents 4c8305221193e14752e0fa833a38f856bbe1d22b +edac fec53af531dd040e41fe358abe00b33747af2688 +edac-amd 18b44b2b950a0746abe7466021e842c6d7e96443 +irqchip 0dee4f8ec6bb14529d4c2c00625e57d5c43ef498 +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace c19565fc83e6cdb6da8eef166964c887e66e969f +rcu 12c056600523153e5d4cf213fd155fe2e3132ba2 +kvm 4ff6f8e61eb7f96d3ca535c6d240f863ccd6fb7d +kvm-arm 174178fed338edba66ab9580af0c5d9e1a4e5019 +kvm-ppc 2c4aa55a6af070262cca425745e8e54310e96b8d +kvms390 44121ef71960231f5ec12b423711e52b35b7d566 +xen-tip a2e75bc2ee207351e6806e77a5379c6c1dd4598a +percpu 4c907baf36d8339f393bb576d0bab29194d0e6ad +workqueues 3494fc30846dceb808de4cc02930ef347fabd21a +drivers-x86 b4dd04ac6ef88259ddb59ca809ca5845c7892139 +chrome-platform 8ce580932f8ee40903017a6f1408ccfff319a6a5 +regmap 7d720ee52598b49ad70a2572fa159467c5f45dc4 +hsi f034125dfdae466b3e6ad155e722de48d64b82d4 +leds f6ad395bad57dcd15c6423715d15d91363a62ae8 +ipmi 3a31f945b70990f6113b4800338c09d14620dff3 +driver-core c517d838eb7d07bbe9507871fab3931deccff539 +tty 48d7ff0eaacbe5a51037bdb06a8a0a729b804b5f +usb 9eccca0843205f87c00404b663188b88eb248051 +usb-gadget e39af88f18dfe9a7938765c97ce9ed448915e6d5 +usb-serial 394a10331a9e43100a8ee293255cfc428c7355ac +staging 7aa5d5097dbae28ea1edbe95689f26412ce68c65 +char-misc 208d51154c8d7f2c3808b4401132233c5ab21572 +extcon 34825e511971e193db16a96350faeb60eff0d842 +kdbus 9b12c3a3dc37178c3a41e3bbf3633aba53ccd10b +cgroup 695df2132cfe3782784d4b0e1f0027168c1830ca +scsi 0530c35ca4a365763ce94c9b8b29f70da802cbe2 +target-updates d23dbaaaa454667ad6af6feb56f740a990d1295d +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +pinctrl 9e88200386b444b1d0ea647bf1e19e7e82460752 +vhost 1179c21e89171e824172afe5519e71e7033ca770 +remoteproc 315491e5d6ee66838a18a8ca0c14e6ffb376e48c +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio 1fb60ea634547144d10cca77a71966a7332ec307 +dma-mapping 04abab698285297115e5096b3100df1064045529 +pwm 6da89312a39b7017b6d6f899f6b30304e1880f60 +dma-buf 56a4d3e2e2d4423812e44b30c880fe190bc10c44 +userns db86da7cb76f797a1a8b445166a15cb922c6ff85 +ktest 7c2c49eceb79eb4738f38a00270830057b5bfb76 +clk 5cf065f556cb5926127b52563f494c2dd0a878e4 +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +aio 5f785de588735306ec4d7c875caf9d28481c8b21 +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +kselftest 32dcfba6f8df667e4b915e0542b33ccbc8e76fa8 +y2038 ed8c2241c1ae1b64e4a783ae7a2c685c93142a8d +luto-misc a6c5170d1edea97c538c81e377e56c7b5c5b7e63 +access_once c5b19946eb76c67566aae6a84bf2b10ad59295ea +livepatching ebf4ab31f66e7ce7e4aa17ef24121411bbc66499 +akpm-current 5c9207e2c9bd1bb575ae3b250b2cd5a249ae80c5 +akpm 386508942afe5f6d20af7a8dda6d7322c89ff968 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..4328f95d9bca --- /dev/null +++ b/Next/Trees @@ -0,0 +1,214 @@ +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 git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +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 +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 +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 +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 git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +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-3/jdelvare-hwmon/ +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 +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 +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 +virtio git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-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 +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..819d7df5a765 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6388 @@ +$ date +Monday 16 March 10:34:36 AEDT 2015 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at ba68bc0115eb mm: thp: Return the correct value for change_huge_pmd +Merging origin/master (08352086de06 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux) +$ git merge origin/master +Updating ba68bc0115eb..08352086de06 +Fast-forward + .../bindings/arm/exynos/power_domain.txt | 2 + + Documentation/devicetree/bindings/arm/sti.txt | 4 + + .../devicetree/bindings/power/power_domain.txt | 29 ++ + .../bindings/serial/{of-serial.txt => 8250.txt} | 0 + .../bindings/serial/axis,etraxfs-uart.txt | 19 + + .../devicetree/bindings/submitting-patches.txt | 3 + + .../devicetree/bindings/vendor-prefixes.txt | 2 + + .../devicetree/bindings/watchdog/atmel-wdt.txt | 5 + + MAINTAINERS | 12 +- + arch/arm/Makefile | 1 + + arch/arm/boot/dts/am335x-bone-common.dtsi | 8 + + arch/arm/boot/dts/am335x-bone.dts | 8 - + arch/arm/boot/dts/am335x-lxm.dts | 4 + + arch/arm/boot/dts/am33xx-clocks.dtsi | 6 +- + arch/arm/boot/dts/am43xx-clocks.dtsi | 12 +- + arch/arm/boot/dts/at91sam9260.dtsi | 7 +- + arch/arm/boot/dts/at91sam9261.dtsi | 9 +- + arch/arm/boot/dts/at91sam9263.dtsi | 5 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 3 +- + arch/arm/boot/dts/at91sam9n12.dtsi | 1 - + arch/arm/boot/dts/at91sam9x5.dtsi | 5 +- + arch/arm/boot/dts/dra7-evm.dts | 10 +- + arch/arm/boot/dts/dra72-evm.dts | 10 +- + arch/arm/boot/dts/dra7xx-clocks.dtsi | 90 +++- + arch/arm/boot/dts/exynos3250.dtsi | 2 + + arch/arm/boot/dts/exynos4-cpu-thermal.dtsi | 52 +++ + arch/arm/boot/dts/exynos4.dtsi | 45 ++ + arch/arm/boot/dts/exynos4210-trats.dts | 19 + + arch/arm/boot/dts/exynos4210-universal_c210.dts | 57 +++ + arch/arm/boot/dts/exynos4210.dtsi | 38 +- + arch/arm/boot/dts/exynos4212.dtsi | 5 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 64 +++ + arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi | 24 ++ + arch/arm/boot/dts/exynos4412-trats2.dts | 15 + + arch/arm/boot/dts/exynos4412.dtsi | 5 +- + arch/arm/boot/dts/exynos4x12.dtsi | 12 + + arch/arm/boot/dts/exynos5250.dtsi | 44 +- + arch/arm/boot/dts/exynos5420-trip-points.dtsi | 35 ++ + arch/arm/boot/dts/exynos5420.dtsi | 33 +- + arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi | 24 ++ + arch/arm/boot/dts/exynos5440-trip-points.dtsi | 25 ++ + arch/arm/boot/dts/exynos5440.dtsi | 18 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 + + arch/arm/boot/dts/imx6sl-evk.dts | 2 + + arch/arm/boot/dts/omap5-core-thermal.dtsi | 2 +- + arch/arm/boot/dts/omap5-gpu-thermal.dtsi | 2 +- + arch/arm/boot/dts/omap5.dtsi | 4 + + arch/arm/boot/dts/omap54xx-clocks.dtsi | 41 +- + arch/arm/boot/dts/sama5d3.dtsi | 3 +- + arch/arm/boot/dts/sama5d4.dtsi | 9 +- + arch/arm/boot/dts/socfpga.dtsi | 6 + + arch/arm/configs/at91_dt_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/omap2plus_defconfig | 1 + + arch/arm/configs/sama5_defconfig | 2 - + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm/configs/vexpress_defconfig | 2 +- + arch/arm/include/debug/at91.S | 5 +- + arch/arm/mach-at91/pm.c | 22 +- + arch/arm/mach-at91/pm.h | 2 +- + arch/arm/mach-at91/pm_slowclock.S | 80 ++-- + arch/arm/mach-exynos/platsmp.c | 3 +- + arch/arm/mach-exynos/pm_domains.c | 28 ++ + arch/arm/mach-exynos/suspend.c | 4 +- + arch/arm/mach-imx/mach-imx6q.c | 5 +- + arch/arm/mach-omap2/omap_hwmod.c | 10 +- + arch/arm/mach-omap2/omap_hwmod.h | 1 + + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 103 ++--- + arch/arm/mach-omap2/pdata-quirks.c | 1 + + arch/arm/mach-omap2/prm44xx.c | 4 +- + arch/arm/mach-socfpga/core.h | 2 +- + arch/arm/mach-socfpga/socfpga.c | 5 + + arch/arm/mach-sti/board-dt.c | 1 + + arch/arm64/include/asm/tlb.h | 3 + + arch/arm64/include/asm/tlbflush.h | 13 + + arch/arm64/kernel/efi.c | 9 + + arch/arm64/kernel/head.S | 2 +- + arch/arm64/kernel/process.c | 8 + + arch/c6x/include/asm/pgtable.h | 5 + + arch/x86/xen/p2m.c | 2 +- + drivers/acpi/acpi_lpss.c | 5 +- + drivers/clk/clk-divider.c | 29 +- + drivers/clk/clk.c | 27 +- + drivers/clk/qcom/gcc-msm8960.c | 13 + + drivers/clk/qcom/lcc-ipq806x.c | 1 - + drivers/clk/qcom/lcc-msm8960.c | 7 +- + drivers/clk/ti/fapll.c | 6 +- + drivers/gpu/drm/drm_crtc.c | 35 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 11 +- + drivers/gpu/drm/drm_mm.c | 2 +- + drivers/gpu/drm/i915/i915_gem.c | 25 +- + drivers/gpu/drm/i915/intel_display.c | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 8 +- + drivers/gpu/drm/radeon/radeon_fence.c | 68 ++- + drivers/gpu/drm/radeon/si.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 78 ++-- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 14 +- + drivers/irqchip/irq-armada-370-xp.c | 21 +- + drivers/irqchip/irq-gic-v3-its.c | 157 +++++-- + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-gic.c | 20 +- + drivers/of/Kconfig | 3 +- + drivers/of/base.c | 27 +- + drivers/of/overlay.c | 3 +- + drivers/of/unittest.c | 28 +- + drivers/rtc/rtc-s3c.c | 1 + + drivers/scsi/libsas/sas_discover.c | 6 +- + drivers/usb/gadget/function/f_fs.c | 204 ++++----- + drivers/usb/gadget/legacy/inode.c | 466 +++++++++------------ + drivers/vfio/pci/vfio_pci_intrs.c | 2 + + drivers/xen/events/events_base.c | 18 +- + drivers/xen/xen-pciback/conf_space.c | 2 +- + drivers/xen/xen-pciback/conf_space.h | 2 + + drivers/xen/xen-pciback/conf_space_header.c | 61 ++- + fs/locks.c | 2 +- + fs/nilfs2/segment.c | 7 +- + fs/notify/fanotify/fanotify.c | 3 +- + fs/ocfs2/ocfs2.h | 2 +- + fs/ocfs2/ocfs2_fs.h | 15 +- + include/dt-bindings/pinctrl/am33xx.h | 3 +- + include/dt-bindings/pinctrl/am43xx.h | 3 +- + include/linux/clk.h | 18 + + include/linux/irqchip/arm-gic-v3.h | 5 + + include/linux/kasan.h | 9 +- + include/linux/moduleloader.h | 8 + + include/linux/of_platform.h | 2 +- + include/linux/uio.h | 2 + + include/linux/vmalloc.h | 1 + + include/soc/at91/at91sam9_ddrsdr.h | 2 +- + include/xen/xenbus.h | 4 +- + kernel/module.c | 2 - + lib/Makefile | 2 +- + {mm => lib}/iov_iter.c | 15 + + mm/Makefile | 2 +- + mm/cma.c | 12 +- + mm/hugetlb.c | 4 +- + mm/kasan/kasan.c | 14 +- + mm/memcontrol.c | 4 +- + mm/mlock.c | 4 +- + mm/nommu.c | 1 + + mm/page_alloc.c | 3 +- + mm/vmalloc.c | 1 + + sound/core/control.c | 4 + + sound/firewire/dice/dice-interface.h | 18 +- + sound/firewire/dice/dice-proc.c | 4 +- + sound/firewire/iso-resources.c | 3 +- + sound/pci/hda/hda_controller.c | 2 +- + sound/pci/hda/hda_generic.c | 30 +- + sound/pci/hda/patch_cirrus.c | 2 + + sound/pci/hda/patch_conexant.c | 11 + + sound/soc/fsl/fsl_spdif.c | 4 +- + sound/soc/kirkwood/kirkwood-i2s.c | 2 +- + sound/usb/quirks-table.h | 30 ++ + tools/power/cpupower/Makefile | 2 +- + tools/testing/selftests/exec/execveat.c | 10 +- + 156 files changed, 1909 insertions(+), 911 deletions(-) + rename Documentation/devicetree/bindings/serial/{of-serial.txt => 8250.txt} (100%) + create mode 100644 Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt + create mode 100644 arch/arm/boot/dts/exynos4-cpu-thermal.dtsi + create mode 100644 arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi + create mode 100644 arch/arm/boot/dts/exynos5420-trip-points.dtsi + create mode 100644 arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi + create mode 100644 arch/arm/boot/dts/exynos5440-trip-points.dtsi + rename {mm => lib}/iov_iter.c (97%) +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 (2ce7598c9a45 Linux 3.17-rc4) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (6d021b724481 ARM: dump pgd, pmd and pte states on unhandled data abort faults) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/fault.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging m68k-current/for-linus (4436820a98cd m68k/defconfig: Enable Ethernet bridging) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (c2996cb29bfb metag: Fix KSTK_EIP() and KSTK_ESP() macros) +$ 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/merge (c517d838eb7d Linux 4.0-rc1) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging powerpc-merge-mpe/fixes (4ad04e598711 powerpc/iommu: Remove IOMMU device references via bus notifier) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (53eb2516972b sparc: semtimedop() unreachable due to comparison error) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/include/asm/io_64.h | 20 ++++++++++---------- + arch/sparc/include/asm/starfire.h | 1 - + arch/sparc/kernel/entry.h | 4 ---- + arch/sparc/kernel/smp_64.c | 27 ++++++++++++++++++++++++--- + arch/sparc/kernel/starfire.c | 5 ----- + arch/sparc/kernel/sys_sparc_64.c | 2 +- + arch/sparc/kernel/traps_64.c | 30 ++---------------------------- + 7 files changed, 37 insertions(+), 52 deletions(-) +Merging net/master (4c906c279886 bridge: reset bridge mtu after deleting an interface) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/net/can/Kconfig | 2 +- + drivers/net/can/usb/kvaser_usb.c | 83 +++++++++++++++--------- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +- + drivers/net/ethernet/freescale/fec_main.c | 37 ++++------- + drivers/net/ethernet/ibm/ibmveth.c | 4 +- + drivers/net/ethernet/wiznet/w5100.c | 2 +- + drivers/net/ethernet/wiznet/w5300.c | 2 +- + drivers/net/virtio_net.c | 9 ++- + drivers/net/vxlan.c | 4 +- + drivers/net/wireless/b43/main.c | 1 + + drivers/net/wireless/brcm80211/brcmfmac/vendor.c | 15 ++++- + drivers/net/wireless/iwlwifi/iwl-1000.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-2000.c | 13 ++-- + drivers/net/wireless/iwlwifi/iwl-5000.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 18 +++-- + drivers/net/wireless/iwlwifi/mvm/coex.c | 3 +- + drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 3 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 38 ++++++++++- + drivers/net/wireless/iwlwifi/mvm/rs.c | 21 ++++-- + drivers/net/wireless/iwlwifi/mvm/scan.c | 13 ++-- + drivers/net/wireless/iwlwifi/mvm/time-event.c | 9 +-- + drivers/net/wireless/rtlwifi/base.c | 7 +- + drivers/net/xen-netback/netback.c | 23 +++---- + include/linux/skbuff.h | 7 ++ + include/net/vxlan.h | 1 + + net/bridge/br_if.c | 2 + + net/core/rtnetlink.c | 26 ++++---- + net/core/skbuff.c | 10 ++- + net/core/sock.c | 4 ++ + net/core/sysctl_net_core.c | 10 +-- + net/ipv4/inet_diag.c | 18 ++++- + net/ipv4/ip_forward.c | 1 + + net/ipv4/tcp_cong.c | 6 ++ + net/ipv4/tcp_cubic.c | 6 +- + net/ipv6/ip6_output.c | 1 + + net/rds/iw_rdma.c | 40 +++++++----- + net/sched/cls_u32.c | 5 +- + 39 files changed, 291 insertions(+), 171 deletions(-) +Merging ipsec/master (ac37e2515c1a xfrm: release dst_orig in case of error in xfrm_lookup()) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/dst.h | 1 + + net/ipv4/xfrm4_output.c | 2 +- + net/ipv6/xfrm6_output.c | 2 +- + net/ipv6/xfrm6_policy.c | 1 + + net/xfrm/xfrm_policy.c | 12 ++++++------ + 5 files changed, 10 insertions(+), 8 deletions(-) +Merging sound-current/for-linus (ef403edb7558 ALSA: hda - Don't access stereo amps for mono channel widgets) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (bc3b5b47c80d PCI: cpcihp: Add missing curly braces in cpci_configure_slot()) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/host/pcie-designware.c | 2 +- + drivers/pci/host/pcie-spear13xx.c | 6 +++--- + drivers/pci/hotplug/cpci_hotplug_pci.c | 3 ++- + drivers/pci/pcie/aer/aerdrv_errprint.c | 12 ++---------- + 4 files changed, 8 insertions(+), 15 deletions(-) +Merging wireless-drivers/master (3f1615340ace brcmfmac: Perform bound checking on vendor command buffer) +$ git merge wireless-drivers/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (c517d838eb7d Linux 4.0-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (7fd6f640f2dd serial: 8250_dw: Fix deadlock in LCR workaround) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + drivers/tty/serial/8250/8250_dw.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) +Merging usb.current/usb-linus (963ffa3e97d4 MAINTAINERS: add entry for USB OTG FSM) +$ git merge usb.current/usb-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 + + drivers/phy/phy-armada375-usb2.c | 3 +- + drivers/phy/phy-core.c | 11 +- + drivers/phy/phy-exynos-dp-video.c | 24 +- + drivers/phy/phy-exynos-mipi-video.c | 11 +- + drivers/phy/phy-exynos4210-usb2.c | 1 - + drivers/phy/phy-exynos4x12-usb2.c | 1 - + drivers/phy/phy-exynos5-usbdrd.c | 2 +- + drivers/phy/phy-exynos5250-usb2.c | 1 - + drivers/phy/phy-hix5hd2-sata.c | 3 + + drivers/phy/phy-miphy28lp.c | 13 +- + drivers/phy/phy-miphy365x.c | 12 +- + drivers/phy/phy-omap-control.c | 2 +- + drivers/phy/phy-omap-usb2.c | 7 +- + drivers/phy/phy-rockchip-usb.c | 6 +- + drivers/phy/phy-ti-pipe3.c | 12 +- + drivers/phy/phy-twl4030-usb.c | 1 - + drivers/phy/phy-xgene.c | 1 - + drivers/usb/chipidea/udc.c | 11 + + drivers/usb/dwc2/core_intr.c | 3 + + drivers/usb/gadget/function/f_loopback.c | 3 +- + drivers/usb/gadget/function/f_sourcesink.c | 511 ++--------------------------- + drivers/usb/gadget/function/g_zero.h | 13 +- + drivers/usb/gadget/legacy/zero.c | 21 -- + drivers/usb/host/xhci-ring.c | 2 +- + drivers/usb/host/xhci.c | 100 +----- + drivers/usb/host/xhci.h | 2 - + drivers/usb/isp1760/isp1760-core.c | 3 +- + drivers/usb/isp1760/isp1760-udc.c | 16 +- + drivers/usb/musb/Kconfig | 3 +- + drivers/usb/phy/phy-am335x-control.c | 3 + + 31 files changed, 113 insertions(+), 696 deletions(-) +Merging usb-gadget-fixes/fixes (2c247804796b Revert "usb: gadget: zero: Add support for interrupt EP") +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (9eccca084320 Linux 4.0-rc3) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (1f51d5801859 vt6655: Fix late setting of byRFType.) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/vt6655/device_main.c | 32 +++++++++++++++----------------- + drivers/staging/vt6655/rf.c | 1 + + drivers/staging/vt6656/rf.c | 1 + + 3 files changed, 17 insertions(+), 17 deletions(-) +Merging char-misc.current/char-misc-linus (3d7a8278fdfd Revert "pcmcia: add a new resource manager for non ISA systems") +$ git merge char-misc.current/char-misc-linus +Removing drivers/pcmcia/rsrc_pci.c +Merge made by the 'recursive' strategy. + drivers/pcmcia/Kconfig | 12 +--- + drivers/pcmcia/Makefile | 1 - + drivers/pcmcia/rsrc_pci.c | 173 ---------------------------------------------- + 3 files changed, 3 insertions(+), 183 deletions(-) + delete mode 100644 drivers/pcmcia/rsrc_pci.c +Merging input-current/for-linus (4eb8d6e7e5aa Input: psmouse - disable "palm detection" in the focaltech driver) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (ccfe8c3f7e52 crypto: aesni - fix memory usage in GCM decryption) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + arch/arm/crypto/aesbs-core.S_shipped | 12 ++++++++---- + arch/arm/crypto/bsaes-armv7.pl | 12 ++++++++---- + arch/x86/crypto/aesni-intel_glue.c | 4 ++-- + 3 files changed, 18 insertions(+), 10 deletions(-) +Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge ide/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (6b1271de3723 of/unittest: Overlays with sub-devices tests) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (f47689345931 lguest: update help text.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (ec76f4007079 vfio-pci: Add missing break to enable VFIO_PCI_ERR_IRQ_INDEX) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (9a0b57451ae8 selftests/exec: Check if the syscall exists and bail if not) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (2dccc9898d45 drm/i915: Ensure plane->state->fb stays in sync with plane->fb) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_display.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) +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 (9eccca084320 Linux 4.0-rc3) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (e163910f8e33 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 2 +- + arch/arm/kernel/bios32.c | 10 ++----- + arch/arm/kernel/module.c | 38 +++++++++++++++++---------- + arch/arm/mm/cache-l2x0.c | 7 +++++ + arch/arm/mm/dma-mapping.c | 67 +++++++++++++++++++++++++++++------------------ + 5 files changed, 75 insertions(+), 49 deletions(-) +Merging arm-perf/for-next/perf (97bf6af1f928 Linux 3.19-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (da55c5297d44 arm-soc: document merges) +$ git merge arm-soc/for-next +Auto-merging drivers/pcmcia/Kconfig +Removing arch/arm/mach-shmobile/sleep-sh7372.S +Removing arch/arm/mach-shmobile/sh7372.h +Removing arch/arm/mach-shmobile/setup-sh7372.c +Removing arch/arm/mach-shmobile/pm-sh7372.c +Removing arch/arm/mach-shmobile/intc-sh7372.c +Removing arch/arm/mach-shmobile/include/mach/uncompress.h +Removing arch/arm/mach-shmobile/include/mach/system.h +Removing arch/arm/mach-shmobile/include/mach/sdhi.h +Removing arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h +Removing arch/arm/mach-shmobile/include/mach/mmc.h +Removing arch/arm/mach-shmobile/include/mach/mmc-mackerel.h +Removing arch/arm/mach-shmobile/include/mach/head-mackerel.txt +Removing arch/arm/mach-shmobile/include/mach/clkdev.h +Removing arch/arm/mach-shmobile/entry-intc.S +Removing arch/arm/mach-shmobile/clock-sh7372.c +Removing arch/arm/mach-shmobile/board-mackerel.c +Removing arch/arm/mach-at91/setup.c +Removing arch/arm/mach-at91/pm_slowclock.S +Removing arch/arm/mach-at91/include/mach/io.h +Removing arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h +Removing arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h +Removing arch/arm/mach-at91/include/mach/at91sam9n12_matrix.h +Removing arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h +Removing arch/arm/mach-at91/include/mach/at91sam9263_matrix.h +Removing arch/arm/mach-at91/include/mach/at91sam9261_matrix.h +Removing arch/arm/mach-at91/include/mach/at91sam9260_matrix.h +Removing arch/arm/mach-at91/include/mach/at91_matrix.h +Removing arch/arm/configs/mackerel_defconfig +Removing arch/arm/boot/dts/sh7372.dtsi +Removing arch/arm/boot/dts/sh7372-mackerel.dts +Removing arch/arm/boot/compressed/sdhi-shmobile.h +Removing arch/arm/boot/compressed/sdhi-shmobile.c +Removing arch/arm/boot/compressed/sdhi-sh7372.c +Removing arch/arm/boot/compressed/mmcif-sh7372.c +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Removing Documentation/devicetree/bindings/arm/geniatech.txt +Removing Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt +Removing Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt +Removing Documentation/arm/SH-Mobile/vrl4.c +Removing Documentation/arm/SH-Mobile/Makefile +Removing Documentation/arm/Makefile +Merge made by the 'recursive' strategy. + Documentation/Makefile | 2 +- + Documentation/arm/Makefile | 1 - + Documentation/arm/Marvell/README | 5 + + Documentation/arm/SH-Mobile/Makefile | 7 - + Documentation/arm/SH-Mobile/vrl4.c | 170 --- + Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt | 29 - + Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt | 42 - + Documentation/devicetree/bindings/arm/amlogic.txt | 4 + + .../devicetree/bindings/arm/armada-39x.txt | 20 + + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + .../devicetree/bindings/arm/geniatech.txt | 5 - + Documentation/devicetree/bindings/arm/shmobile.txt | 4 - + .../devicetree/bindings/bus/renesas,bsc.txt | 46 + + .../devicetree/bindings/bus/simple-pm-bus.txt | 44 + + .../bindings/clock/renesas,r8a7778-cpg-clocks.txt | 25 + + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + + .../devicetree/bindings/serial/atmel-usart.txt | 3 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 1 - + arch/arm/Kconfig | 32 +- + arch/arm/Kconfig.debug | 10 +- + arch/arm/arm-soc-for-next-contents.txt | 88 ++ + arch/arm/boot/compressed/Makefile | 15 - + arch/arm/boot/compressed/head-shmobile.S | 30 - + arch/arm/boot/compressed/mmcif-sh7372.c | 88 -- + arch/arm/boot/compressed/sdhi-sh7372.c | 95 -- + arch/arm/boot/compressed/sdhi-shmobile.c | 449 ------ + arch/arm/boot/compressed/sdhi-shmobile.h | 11 - + arch/arm/boot/dts/Makefile | 14 +- + arch/arm/boot/dts/armada-370-db.dts | 2 +- + arch/arm/boot/dts/armada-370-mirabox.dts | 2 +- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 2 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 2 +- + arch/arm/boot/dts/armada-370-rd.dts | 2 +- + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 3 +- + arch/arm/boot/dts/armada-370-xp.dtsi | 6 +- + arch/arm/boot/dts/armada-370.dtsi | 2 +- + arch/arm/boot/dts/armada-375-db.dts | 2 +- + arch/arm/boot/dts/armada-375.dtsi | 10 +- + arch/arm/boot/dts/armada-385-db-ap.dts | 16 +- + arch/arm/boot/dts/armada-388-db.dts | 4 +- + arch/arm/boot/dts/armada-388-gp.dts | 5 +- + arch/arm/boot/dts/armada-388-rd.dts | 12 +- + arch/arm/boot/dts/armada-38x.dtsi | 18 +- + arch/arm/boot/dts/armada-390.dtsi | 57 + + arch/arm/boot/dts/armada-398-db.dts | 153 ++ + arch/arm/boot/dts/armada-398.dtsi | 60 + + arch/arm/boot/dts/armada-39x.dtsi | 508 +++++++ + 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-lenovo-ix4-300d.dts | 3 +- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 393 +++++ + arch/arm/boot/dts/armada-xp-matrix.dts | 2 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 1 - + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 1 - + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 2 +- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 +- + arch/arm/boot/dts/armada-xp-synology-ds414.dts | 3 +- + arch/arm/boot/dts/armada-xp.dtsi | 5 +- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 8 + + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 241 ++++ + arch/arm/boot/dts/at91-sama5d4ek.dts | 55 +- + arch/arm/boot/dts/at91rm9200.dtsi | 2 +- + arch/arm/boot/dts/at91sam9260.dtsi | 2 +- + arch/arm/boot/dts/at91sam9261.dtsi | 2 +- + arch/arm/boot/dts/at91sam9263.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g25.dtsi | 1 + + arch/arm/boot/dts/at91sam9g25ek.dts | 18 + + arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- + arch/arm/boot/dts/at91sam9n12.dtsi | 11 +- + arch/arm/boot/dts/at91sam9n12ek.dts | 14 + + arch/arm/boot/dts/at91sam9rl.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x5_isi.dtsi | 46 + + arch/arm/boot/dts/at91sam9x5ek.dtsi | 48 + + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 4 +- + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 77 + + arch/arm/boot/dts/bcm958305k.dts | 53 + + arch/arm/boot/dts/dove.dtsi | 63 +- + arch/arm/boot/dts/emev2-kzm9d.dts | 13 + + arch/arm/boot/dts/emev2.dtsi | 10 + + arch/arm/boot/dts/kirkwood-net2big.dts | 5 + + arch/arm/boot/dts/meson.dtsi | 20 + + arch/arm/boot/dts/meson6-atv1200.dts | 4 + + arch/arm/boot/dts/meson8-minix-neo-x8.dts | 128 ++ + arch/arm/boot/dts/meson8.dtsi | 68 + + arch/arm/boot/dts/nspire-classic.dtsi | 5 + + arch/arm/boot/dts/nspire-cx.dts | 4 + + arch/arm/boot/dts/nspire.dtsi | 21 + + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 22 +- + arch/arm/boot/dts/r8a7740.dtsi | 79 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 174 +++ + arch/arm/boot/dts/r8a7778.dtsi | 293 ++++ + arch/arm/boot/dts/r8a7779-marzen.dts | 9 + + arch/arm/boot/dts/r8a7790-lager.dts | 69 + + arch/arm/boot/dts/r8a7790.dtsi | 117 +- + arch/arm/boot/dts/r8a7791-henninger.dts | 11 + + arch/arm/boot/dts/r8a7791-koelsch.dts | 69 +- + arch/arm/boot/dts/r8a7791.dtsi | 136 +- + arch/arm/boot/dts/r8a7794-alt.dts | 13 + + arch/arm/boot/dts/r8a7794.dtsi | 157 +- + arch/arm/boot/dts/sama5d3.dtsi | 2 +- + arch/arm/boot/dts/sama5d35ek.dts | 2 - + arch/arm/boot/dts/sama5d3_can.dtsi | 2 +- + arch/arm/boot/dts/sama5d3_emac.dtsi | 2 +- + arch/arm/boot/dts/sama5d3_gmac.dtsi | 2 +- + arch/arm/boot/dts/sama5d3_lcd.dtsi | 2 +- + arch/arm/boot/dts/sama5d3_mci2.dtsi | 2 +- + arch/arm/boot/dts/sama5d3_tcb1.dtsi | 2 +- + arch/arm/boot/dts/sama5d3_uart.dtsi | 2 +- + arch/arm/boot/dts/sama5d4.dtsi | 194 ++- + arch/arm/boot/dts/sh7372-mackerel.dts | 26 - + arch/arm/boot/dts/sh7372.dtsi | 35 - + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 42 +- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/boot/dts/sh73a0.dtsi | 82 +- + arch/arm/configs/mackerel_defconfig | 157 -- + arch/arm/configs/mvebu_v7_defconfig | 1 + + arch/arm/mach-at91/Kconfig | 19 +- + arch/arm/mach-at91/Makefile | 4 +- + arch/arm/mach-at91/at91rm9200.c | 29 +- + arch/arm/mach-at91/at91sam9.c | 76 +- + arch/arm/mach-at91/generic.h | 4 - + arch/arm/mach-at91/include/mach/at91_matrix.h | 23 - + .../mach-at91/include/mach/at91sam9260_matrix.h | 80 - + .../mach-at91/include/mach/at91sam9261_matrix.h | 64 - + .../mach-at91/include/mach/at91sam9263_matrix.h | 129 -- + .../mach-at91/include/mach/at91sam9g45_matrix.h | 153 -- + .../mach-at91/include/mach/at91sam9n12_matrix.h | 53 - + .../arm/mach-at91/include/mach/at91sam9rl_matrix.h | 96 -- + .../arm/mach-at91/include/mach/at91sam9x5_matrix.h | 53 - + arch/arm/mach-at91/include/mach/io.h | 27 - + arch/arm/mach-at91/pm.c | 139 +- + arch/arm/mach-at91/pm.h | 14 +- + arch/arm/mach-at91/pm_slowclock.S | 335 ----- + arch/arm/mach-at91/pm_suspend.S | 338 +++++ + arch/arm/mach-at91/sama5.c | 97 +- + arch/arm/mach-at91/setup.c | 330 ----- + arch/arm/mach-at91/soc.c | 97 ++ + arch/arm/mach-at91/soc.h | 78 + + arch/arm/mach-cns3xxx/pm.c | 1 - + arch/arm/mach-meson/Kconfig | 3 + + arch/arm/mach-mvebu/Kconfig | 14 + + arch/arm/mach-mvebu/board-v7.c | 20 +- + arch/arm/mach-mvebu/dove.c | 2 +- + arch/arm/mach-mvebu/kirkwood.c | 2 +- + arch/arm/mach-mvebu/platsmp-a9.c | 2 + + arch/arm/mach-shmobile/Kconfig | 20 +- + arch/arm/mach-shmobile/Makefile | 6 - + arch/arm/mach-shmobile/Makefile.boot | 1 - + arch/arm/mach-shmobile/board-bockw-reference.c | 2 + + arch/arm/mach-shmobile/board-mackerel.c | 1522 -------------------- + arch/arm/mach-shmobile/clock-sh7372.c | 620 -------- + arch/arm/mach-shmobile/clock.c | 11 - + arch/arm/mach-shmobile/common.h | 1 - + arch/arm/mach-shmobile/entry-intc.S | 54 - + arch/arm/mach-shmobile/include/mach/clkdev.h | 7 - + .../mach-shmobile/include/mach/head-mackerel.txt | 93 -- + arch/arm/mach-shmobile/include/mach/mmc-mackerel.h | 38 - + arch/arm/mach-shmobile/include/mach/mmc.h | 16 - + arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h | 21 - + arch/arm/mach-shmobile/include/mach/sdhi.h | 16 - + arch/arm/mach-shmobile/include/mach/system.h | 11 - + arch/arm/mach-shmobile/include/mach/uncompress.h | 19 - + arch/arm/mach-shmobile/include/mach/zboot.h | 5 +- + arch/arm/mach-shmobile/intc-sh7372.c | 672 --------- + arch/arm/mach-shmobile/pm-sh7372.c | 549 ------- + arch/arm/mach-shmobile/setup-r8a7778.c | 19 + + arch/arm/mach-shmobile/setup-rcar-gen2.c | 3 +- + arch/arm/mach-shmobile/setup-sh7372.c | 1016 ------------- + arch/arm/mach-shmobile/sh7372.h | 84 -- + arch/arm/mach-shmobile/sleep-sh7372.S | 98 -- + arch/arm/mach-shmobile/smp-r8a7779.c | 7 - + arch/arm/mach-shmobile/smp-r8a7790.c | 4 +- + arch/arm/mach-shmobile/smp-r8a7791.c | 2 +- + arch/arm/tools/mach-types | 1 - + arch/arm64/Kconfig | 10 + + arch/arm64/boot/dts/Makefile | 2 + + arch/arm64/boot/dts/sprd/Makefile | 5 + + arch/arm64/boot/dts/sprd/sc9836-openphone.dts | 49 + + arch/arm64/boot/dts/sprd/sc9836.dtsi | 74 + + arch/arm64/boot/dts/sprd/sharkl64.dtsi | 65 + + arch/arm64/boot/dts/xilinx/Makefile | 5 + + arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 47 + + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 305 ++++ + arch/arm64/configs/defconfig | 4 + + drivers/bus/Kconfig | 53 +- + drivers/bus/Makefile | 15 +- + drivers/bus/simple-pm-bus.c | 58 + + drivers/clk/shmobile/Makefile | 1 + + drivers/clk/shmobile/clk-r8a7778.c | 143 ++ + drivers/pcmcia/Kconfig | 1 + + drivers/pcmcia/at91_cf.c | 13 +- + include/dt-bindings/clock/r8a7778-clock.h | 71 + + include/dt-bindings/clock/r8a7790-clock.h | 3 + + include/dt-bindings/clock/r8a7791-clock.h | 3 + + include/dt-bindings/clock/sh73a0-clock.h | 3 + + include/linux/clk/shmobile.h | 1 + + 199 files changed, 5486 insertions(+), 7809 deletions(-) + delete mode 100644 Documentation/arm/Makefile + delete mode 100644 Documentation/arm/SH-Mobile/Makefile + delete mode 100644 Documentation/arm/SH-Mobile/vrl4.c + delete mode 100644 Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt + delete mode 100644 Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt + create mode 100644 Documentation/devicetree/bindings/arm/armada-39x.txt + delete mode 100644 Documentation/devicetree/bindings/arm/geniatech.txt + create mode 100644 Documentation/devicetree/bindings/bus/renesas,bsc.txt + create mode 100644 Documentation/devicetree/bindings/bus/simple-pm-bus.txt + create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7778-cpg-clocks.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + delete mode 100644 arch/arm/boot/compressed/mmcif-sh7372.c + delete mode 100644 arch/arm/boot/compressed/sdhi-sh7372.c + delete mode 100644 arch/arm/boot/compressed/sdhi-shmobile.c + delete mode 100644 arch/arm/boot/compressed/sdhi-shmobile.h + create mode 100644 arch/arm/boot/dts/armada-390.dtsi + create mode 100644 arch/arm/boot/dts/armada-398-db.dts + create mode 100644 arch/arm/boot/dts/armada-398.dtsi + create mode 100644 arch/arm/boot/dts/armada-39x.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-linksys-mamba.dts + create mode 100644 arch/arm/boot/dts/at91-sama5d4_xplained.dts + create mode 100644 arch/arm/boot/dts/bcm4709-netgear-r8000.dts + create mode 100644 arch/arm/boot/dts/bcm958305k.dts + create mode 100644 arch/arm/boot/dts/meson8-minix-neo-x8.dts + delete mode 100644 arch/arm/boot/dts/sh7372-mackerel.dts + delete mode 100644 arch/arm/boot/dts/sh7372.dtsi + delete mode 100644 arch/arm/configs/mackerel_defconfig + delete mode 100644 arch/arm/mach-at91/include/mach/at91_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9260_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9261_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9263_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9n12_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h + delete mode 100644 arch/arm/mach-at91/include/mach/io.h + delete mode 100644 arch/arm/mach-at91/pm_slowclock.S + create mode 100644 arch/arm/mach-at91/pm_suspend.S + delete mode 100644 arch/arm/mach-at91/setup.c + create mode 100644 arch/arm/mach-at91/soc.c + create mode 100644 arch/arm/mach-at91/soc.h + delete mode 100644 arch/arm/mach-shmobile/board-mackerel.c + delete mode 100644 arch/arm/mach-shmobile/clock-sh7372.c + delete mode 100644 arch/arm/mach-shmobile/entry-intc.S + delete mode 100644 arch/arm/mach-shmobile/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/head-mackerel.txt + delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc-mackerel.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/sdhi.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/system.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-shmobile/intc-sh7372.c + delete mode 100644 arch/arm/mach-shmobile/pm-sh7372.c + delete mode 100644 arch/arm/mach-shmobile/setup-sh7372.c + delete mode 100644 arch/arm/mach-shmobile/sh7372.h + delete mode 100644 arch/arm/mach-shmobile/sleep-sh7372.S + create mode 100644 arch/arm64/boot/dts/sprd/Makefile + create mode 100644 arch/arm64/boot/dts/sprd/sc9836-openphone.dts + create mode 100644 arch/arm64/boot/dts/sprd/sc9836.dtsi + create mode 100644 arch/arm64/boot/dts/sprd/sharkl64.dtsi + create mode 100644 arch/arm64/boot/dts/xilinx/Makefile + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts + create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp.dtsi + create mode 100644 drivers/bus/simple-pm-bus.c + create mode 100644 drivers/clk/shmobile/clk-r8a7778.c + create mode 100644 include/dt-bindings/clock/r8a7778-clock.h +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging rpi/for-rpi-next (72a6dbe0ea91 ARM: bcm2835: Use pinctrl header) +$ git merge rpi/for-rpi-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/bcm2835.txt | 31 ++++++++++++++++++++-- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + 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 | 3 ++- + include/dt-bindings/pinctrl/bcm2835.h | 27 +++++++++++++++++++ + 7 files changed, 67 insertions(+), 11 deletions(-) + create mode 100644 include/dt-bindings/pinctrl/bcm2835.h +Merging berlin/berlin/for-next (c517d838eb7d Linux 4.0-rc1) +$ git merge berlin/berlin/for-next +Already up-to-date. +Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M) +$ git merge cortex-m/for-next +Auto-merging arch/arm/boot/compressed/head.S +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/head.S | 33 +++++++++++++++++++++++++++------ + arch/arm/include/asm/unified.h | 8 ++++++++ + 2 files changed, 35 insertions(+), 6 deletions(-) +Merging imx-mxs/for-next (bb4362858cc6 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Removing arch/arm/mach-imx/mach-mx25_3ds.c +Auto-merging arch/arm/mach-imx/mach-imx6q.c +Removing arch/arm/mach-imx/mach-eukrea_cpuimx25.c +Removing arch/arm/mach-imx/iomux-mx25.h +Removing arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c +Removing arch/arm/mach-imx/ehci-imx25.c +Removing arch/arm/mach-imx/devices-imx25.h +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/fsl,imx-gpc.txt | 59 ++ + arch/arm/boot/dts/Makefile | 4 +- + arch/arm/boot/dts/imx25-pdk.dts | 58 ++ + arch/arm/boot/dts/imx25-pinfunc.h | 43 +- + arch/arm/boot/dts/imx27.dtsi | 2 + + arch/arm/boot/dts/imx28-apf28.dts | 2 +- + arch/arm/boot/dts/imx28-apf28dev.dts | 27 +- + arch/arm/boot/dts/imx28.dtsi | 1 + + arch/arm/boot/dts/imx35.dtsi | 1 + + arch/arm/boot/dts/imx50.dtsi | 3 + + arch/arm/boot/dts/imx51.dtsi | 3 + + arch/arm/boot/dts/imx53.dtsi | 3 + + arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 4 + + arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 4 + + arch/arm/boot/dts/imx6q.dtsi | 20 +- + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 4 + + arch/arm/boot/dts/imx6qdl.dtsi | 49 +- + arch/arm/boot/dts/imx6sl-warp.dts | 191 +++++++ + arch/arm/boot/dts/imx6sl.dtsi | 11 +- + arch/arm/boot/dts/imx6sx-sdb-reva.dts | 143 +++++ + arch/arm/boot/dts/imx6sx-sdb.dts | 603 +-------------------- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 562 +++++++++++++++++++ + arch/arm/boot/dts/imx6sx.dtsi | 7 +- + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 31 ++ + arch/arm/boot/dts/vf-colibri.dtsi | 15 + + arch/arm/boot/dts/vf500.dtsi | 4 + + arch/arm/boot/dts/vfxxx.dtsi | 12 +- + arch/arm/configs/imx_v4_v5_defconfig | 3 +- + arch/arm/configs/multi_v5_defconfig | 2 +- + arch/arm/configs/mxs_defconfig | 1 + + arch/arm/mach-imx/Kconfig | 83 +-- + arch/arm/mach-imx/Makefile | 8 +- + arch/arm/mach-imx/clk-imx6q.c | 8 +- + arch/arm/mach-imx/common.h | 1 - + arch/arm/mach-imx/devices-imx25.h | 85 --- + arch/arm/mach-imx/ehci-imx25.c | 99 ---- + arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 310 ----------- + arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 2 +- + arch/arm/mach-imx/gpc.c | 340 +++++++++++- + arch/arm/mach-imx/iomux-mx25.h | 524 ------------------ + arch/arm/mach-imx/iomux-mx3.h | 2 +- + arch/arm/mach-imx/iomux-v3.c | 5 +- + arch/arm/mach-imx/iomux-v3.h | 5 +- + arch/arm/mach-imx/mach-cpuimx35.c | 2 +- + arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 172 ------ + arch/arm/mach-imx/{imx25-dt.c => mach-imx25.c} | 0 + 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-mx25_3ds.c | 270 --------- + arch/arm/mach-imx/mach-mx35_3ds.c | 2 +- + arch/arm/mach-imx/mach-pcm043.c | 2 +- + arch/arm/mach-imx/mach-vpr200.c | 2 +- + arch/arm/mach-imx/pm-imx6.c | 6 +- + drivers/bus/imx-weim.c | 13 +- + include/dt-bindings/clock/imx6qdl-clock.h | 5 +- + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 1 + + 57 files changed, 1627 insertions(+), 2195 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/fsl,imx-gpc.txt + create mode 100644 arch/arm/boot/dts/imx6sl-warp.dts + create mode 100644 arch/arm/boot/dts/imx6sx-sdb-reva.dts + create mode 100644 arch/arm/boot/dts/imx6sx-sdb.dtsi + delete mode 100644 arch/arm/mach-imx/devices-imx25.h + delete mode 100644 arch/arm/mach-imx/ehci-imx25.c + delete mode 100644 arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c + delete mode 100644 arch/arm/mach-imx/iomux-mx25.h + delete mode 100644 arch/arm/mach-imx/mach-eukrea_cpuimx25.c + rename arch/arm/mach-imx/{imx25-dt.c => mach-imx25.c} (100%) + delete mode 100644 arch/arm/mach-imx/mach-mx25_3ds.c +Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (86df292febc0 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. + .../devicetree/bindings/arm/marvell,kirkwood.txt | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/kirkwood-nas2big.dts | 143 +++++++++++++++++++++ + 3 files changed, 145 insertions(+) + create mode 100644 arch/arm/boot/dts/kirkwood-nas2big.dts +Merging omap/for-next (67fd14b3eca6 ARM: dts: am335x-bone*: usb0 is hardwired for peripheral) +$ git merge omap/for-next +Already up-to-date. +Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) +$ git merge omap-pending/for-next +Merge made by the 'recursive' strategy. +Merging renesas/next (845e70e34f9c Merge branch 'heads/dt-for-v4.1' into next) +$ git merge renesas/next +Removing arch/arm/mach-shmobile/r8a73a4.h +Removing arch/arm/mach-shmobile/clock-r8a73a4.c +Removing arch/arm/mach-shmobile/board-kzm9g-reference.c +Removing arch/arm/mach-shmobile/board-ape6evm.c +Removing arch/arm/mach-shmobile/board-ape6evm-reference.c +Removing arch/arm/configs/ape6evm_defconfig +Removing arch/arm/boot/dts/sh73a0-kzm9g-reference.dts +Removing arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 4 - + .../bindings/power/renesas,sysc-rmobile.txt | 1 + + MAINTAINERS | 1 - + arch/arm/Kconfig.debug | 2 +- + arch/arm/boot/dts/Makefile | 8 +- + arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 156 ----- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 37 +- + arch/arm/boot/dts/r8a73a4.dtsi | 557 ++++++++++++++++- + arch/arm/boot/dts/r8a7790-lager.dts | 18 + + arch/arm/boot/dts/r8a7790.dtsi | 142 ++++- + arch/arm/boot/dts/r8a7791-koelsch.dts | 18 + + arch/arm/boot/dts/r8a7791.dtsi | 142 ++++- + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 398 ------------- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 376 +++++++++++- + arch/arm/boot/dts/sh73a0.dtsi | 163 ++++- + arch/arm/configs/ape6evm_defconfig | 109 ---- + arch/arm/configs/shmobile_defconfig | 9 +- + arch/arm/mach-shmobile/Kconfig | 46 +- + arch/arm/mach-shmobile/Makefile | 10 +- + arch/arm/mach-shmobile/Makefile.boot | 3 - + arch/arm/mach-shmobile/board-ape6evm-reference.c | 60 -- + arch/arm/mach-shmobile/board-ape6evm.c | 306 ---------- + arch/arm/mach-shmobile/board-kzm9g-reference.c | 62 -- + arch/arm/mach-shmobile/clock-r8a73a4.c | 659 --------------------- + arch/arm/mach-shmobile/include/mach/zboot.h | 2 +- + arch/arm/mach-shmobile/pm-r8a7790.c | 2 +- + arch/arm/mach-shmobile/pm-r8a7791.c | 2 +- + arch/arm/mach-shmobile/r8a73a4.h | 17 - + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 147 +++++ + arch/arm/mach-shmobile/setup-r8a73a4.c | 273 +-------- + arch/arm/mach-shmobile/setup-r8a7740.c | 8 - + arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 - + arch/arm/mach-shmobile/setup-sh73a0.c | 19 +- + arch/arm/mach-shmobile/sh73a0.h | 1 - + arch/arm/mach-shmobile/smp-sh73a0.c | 2 +- + include/dt-bindings/clock/r8a73a4-clock.h | 62 ++ + 36 files changed, 1591 insertions(+), 2235 deletions(-) + delete mode 100644 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts + delete mode 100644 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts + delete mode 100644 arch/arm/configs/ape6evm_defconfig + delete mode 100644 arch/arm/mach-shmobile/board-ape6evm-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-ape6evm.c + delete mode 100644 arch/arm/mach-shmobile/board-kzm9g-reference.c + delete mode 100644 arch/arm/mach-shmobile/clock-r8a73a4.c + delete mode 100644 arch/arm/mach-shmobile/r8a73a4.h + create mode 100644 arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c + create mode 100644 include/dt-bindings/clock/r8a73a4-clock.h +Merging samsung/for-next (e0e94a5fb27a Merge branch 'v4.0-samsung-defconfig' into for-next) +$ git merge samsung/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 14 ++++ + arch/arm/boot/dts/exynos5250-snow.dts | 56 ++++++++++++++- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 93 +++++++++++++++++++++++-- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 4 +- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 21 +++++- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 62 ++++++++++++++++- + arch/arm/configs/exynos_defconfig | 5 +- + arch/arm/mach-exynos/Kconfig | 1 + + arch/arm/mach-s3c24xx/Kconfig | 19 ++--- + arch/arm/mach-s3c24xx/Makefile | 3 +- + arch/arm/mach-s3c24xx/include/mach/pm-core.h | 24 ++++++- + arch/arm/mach-s3c24xx/pm-s3c2416.c | 3 +- + arch/arm/mach-s3c24xx/pm.c | 6 +- + arch/arm/mach-s3c24xx/s3c2410.c | 2 +- + arch/arm/mach-s3c24xx/s3c2412.c | 2 +- + arch/arm/mach-s3c24xx/s3c2416.c | 2 +- + arch/arm/mach-s3c24xx/s3c2440.c | 4 +- + arch/arm/mach-s3c24xx/s3c2442.c | 4 +- + arch/arm/mach-s3c24xx/s3c244x.c | 7 +- + arch/arm/mach-s3c64xx/Kconfig | 4 +- + arch/arm/mach-s3c64xx/Makefile | 3 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- + arch/arm/mach-s3c64xx/pm.c | 2 + + arch/arm/plat-samsung/include/plat/pm.h | 14 +++- + arch/arm/plat-samsung/pm-debug.c | 1 + + arch/arm/plat-samsung/pm.c | 20 ------ + 27 files changed, 312 insertions(+), 70 deletions(-) +Merging sunxi/sunxi/for-next (0d63d060aa18 Merge branch 'sunxi/dt-for-4.1' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/configs/sunxi_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/clock/sunxi.txt | 2 + + .../devicetree/bindings/vendor-prefixes.txt | 2 + + arch/arm/boot/dts/Makefile | 19 +- + arch/arm/boot/dts/sun4i-a10-a1000.dts | 200 ++++--- + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 168 +++--- + arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 27 + + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 214 ++++--- + arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 168 ++++++ + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 187 +++---- + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 104 ++-- + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 140 +++-- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 188 ++++--- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 177 +++--- + arch/arm/boot/dts/sun4i-a10.dtsi | 54 +- + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 151 +++++ + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 315 ++++++----- + arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 132 +++-- + arch/arm/boot/dts/sun5i-a10s.dtsi | 620 +++------------------ + arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 136 +++-- + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 148 +++-- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 236 ++++---- + arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 203 +++++++ + arch/arm/boot/dts/sun5i-a13.dtsi | 596 +++----------------- + arch/arm/boot/dts/sun5i.dtsi | 577 +++++++++++++++++++ + arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 52 +- + arch/arm/boot/dts/sun6i-a31-colombus.dts | 120 ++-- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 75 ++- + arch/arm/boot/dts/sun6i-a31-i7.dts | 150 +++++ + arch/arm/boot/dts/sun6i-a31-m9.dts | 148 +++-- + arch/arm/boot/dts/sun6i-a31.dtsi | 29 + + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 262 +++++---- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 198 ++++--- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 324 +++++------ + arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 430 +++++++------- + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 260 ++++----- + arch/arm/boot/dts/sun7i-a20-m3.dts | 178 +++--- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 186 +++---- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 288 +++++----- + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 410 +++++++------- + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 191 +++++++ + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 210 ++++--- + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 180 ++++++ + arch/arm/boot/dts/sun7i-a20.dtsi | 10 +- + arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 110 ++-- + arch/arm/boot/dts/sun8i-a23.dtsi | 6 + + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 99 ++++ + arch/arm/boot/dts/sun9i-a80-optimus.dts | 65 +++ + arch/arm/boot/dts/sun9i-a80.dtsi | 122 ++++ + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm/mach-sunxi/Kconfig | 8 +- + drivers/clk/sunxi/Makefile | 1 + + drivers/clk/sunxi/clk-sunxi.c | 88 --- + drivers/clk/sunxi/clk-usb.c | 233 ++++++++ + 54 files changed, 5277 insertions(+), 3922 deletions(-) + create mode 100644 arch/arm/boot/dts/sun4i-a10-gemei-g9.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-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 drivers/clk/sunxi/clk-usb.c +Merging tegra/for-next (7f2674cb733c Merge branch for-4.1/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 557 ++++++++++++++---------------- + arch/arm/mach-tegra/cpuidle-tegra20.c | 5 +- + arch/arm/mach-tegra/irq.c | 2 +- + 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.h | 4 + + drivers/gpio/gpio-tegra.c | 4 +- + drivers/soc/tegra/fuse/fuse-tegra20.c | 6 +- + 9 files changed, 299 insertions(+), 330 deletions(-) +Merging arm64/for-next/core (d476d94f180a arm64: compat: Remove incorrect comment in compat_siginfo) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) +$ git merge blackfin/for-linus +Auto-merging arch/blackfin/mach-bf609/boards/ezkit.c +Merge made by the 'recursive' strategy. + arch/blackfin/configs/BF518F-EZBRD_defconfig | 1 - + arch/blackfin/configs/BF527-TLL6527M_defconfig | 1 - + arch/blackfin/configs/BF533-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF533-STAMP_defconfig | 1 - + arch/blackfin/configs/BF537-STAMP_defconfig | 3 ++- + arch/blackfin/configs/BF538-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF561-ACVILON_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT_defconfig | 1 - + arch/blackfin/configs/CM-BF527_defconfig | 1 - + arch/blackfin/configs/CM-BF533_defconfig | 1 - + arch/blackfin/configs/CM-BF537E_defconfig | 1 - + arch/blackfin/configs/CM-BF537U_defconfig | 1 - + arch/blackfin/configs/CM-BF548_defconfig | 1 - + arch/blackfin/configs/CM-BF561_defconfig | 1 - + arch/blackfin/configs/DNP5370_defconfig | 1 - + arch/blackfin/configs/IP0X_defconfig | 1 - + arch/blackfin/configs/PNAV-10_defconfig | 1 - + arch/blackfin/configs/SRV1_defconfig | 1 - + arch/blackfin/configs/TCM-BF518_defconfig | 1 - + arch/blackfin/configs/TCM-BF537_defconfig | 1 - + arch/blackfin/kernel/kgdb.c | 12 ++++-------- + arch/blackfin/mach-bf609/boards/ezkit.c | 8 ++++---- + 23 files changed, 10 insertions(+), 33 deletions(-) +Merging c6x/for-linux-next (3591276d16f8 c6x: kernel: setup: Include "linux/console.h") +$ git merge c6x/for-linux-next +Merge made by the 'recursive' strategy. + arch/c6x/kernel/setup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging cris/for-next (a38ecbbd0be0 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge cris/for-next +Already up-to-date. +Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (a6b8978c54b7 pstore: Fix sprintf format specifier in pstore_dump()) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (79bf442c79d6 m68k/pci: Remove a superflous KERN_ERR) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/amiga_defconfig | 3 +++ + arch/m68k/configs/apollo_defconfig | 3 +++ + arch/m68k/configs/atari_defconfig | 3 +++ + arch/m68k/configs/bvme6000_defconfig | 3 +++ + arch/m68k/configs/hp300_defconfig | 3 +++ + arch/m68k/configs/mac_defconfig | 3 +++ + arch/m68k/configs/multi_defconfig | 3 +++ + arch/m68k/configs/mvme147_defconfig | 3 +++ + arch/m68k/configs/mvme16x_defconfig | 3 +++ + arch/m68k/configs/q40_defconfig | 5 ++++- + arch/m68k/configs/sun3_defconfig | 3 +++ + arch/m68k/configs/sun3x_defconfig | 3 +++ + arch/m68k/include/asm/mcfqspi.h | 5 ----- + arch/m68k/kernel/pcibios.c | 2 +- + arch/m68k/lib/ashldi3.c | 7 +------ + arch/m68k/lib/ashrdi3.c | 7 +------ + arch/m68k/lib/divsi3.S | 7 +------ + arch/m68k/lib/lshrdi3.c | 7 +------ + arch/m68k/lib/modsi3.S | 7 +------ + arch/m68k/lib/muldi3.c | 7 +------ + arch/m68k/lib/mulsi3.S | 7 +------ + arch/m68k/lib/udivsi3.S | 7 +------ + arch/m68k/lib/umodsi3.S | 7 +------ + 23 files changed, 47 insertions(+), 61 deletions(-) +Merging m68knommu/for-next (df73d16fadd7 m68k: Fix trivial typos in comments) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/include/asm/m68360_pram.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) +$ 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 (1e20959e3c05 mm: fix up numa read-only thread grouping logic) +$ git merge mips/mips-for-linux-next +Recorded preimage for 'drivers/net/can/usb/kvaser_usb.c' +Auto-merging drivers/net/can/usb/kvaser_usb.c +CONFLICT (content): Merge conflict in drivers/net/can/usb/kvaser_usb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/can/usb/kvaser_usb.c'. +[master 4926e5ae10be] Merge remote-tracking branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging nios2/nios2-next (92d5dd8cd6e2 nios2: update pt_regs) +$ git merge nios2/nios2-next +Already up-to-date. +Merging parisc-hd/for-next (64fa6213c716 parisc: Add compile-time check when adding new syscalls) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/pgalloc.h | 1 + + arch/parisc/kernel/signal32.c | 7 ++----- + arch/parisc/kernel/syscall_table.S | 10 ++++++++++ + 3 files changed, 13 insertions(+), 5 deletions(-) +Merging powerpc/next (c517d838eb7d Linux 4.0-rc1) +$ git merge powerpc/next +Already up-to-date. +Merging powerpc-mpe/next (a6130ed253a9 cxl: Add missing return statement after handling AFU errror) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (0dc294f717d4 powerpc/mm: bail out early when flushing TLB page) +$ 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 (6fbfcc3fd01f s390/dasd: remove setting of scheduler from driver) +$ git merge s390/features +Removing arch/s390/math-emu/math.c +Removing arch/s390/math-emu/Makefile +Removing arch/s390/lib/ucmpdi2.c +Removing arch/s390/lib/qrnnd.S +Removing arch/s390/lib/mem32.S +Removing arch/s390/lib/div64.c +Removing arch/s390/kernel/relocate_kernel64.S +Removing arch/s390/kernel/reipl64.S +Removing arch/s390/kernel/head31.S +Removing arch/s390/kernel/entry64.S +Removing arch/s390/boot/compressed/head31.S +Merge made by the 'recursive' strategy. + arch/s390/Kbuild | 1 - + arch/s390/Kconfig | 79 +- + arch/s390/Makefile | 16 +- + arch/s390/boot/compressed/Makefile | 12 +- + arch/s390/boot/compressed/{head64.S => head.S} | 0 + arch/s390/boot/compressed/head31.S | 51 - + arch/s390/boot/compressed/vmlinux.lds.S | 5 - + arch/s390/crypto/crypt_s390.h | 8 +- + arch/s390/hypfs/hypfs_diag0c.c | 4 - + arch/s390/include/asm/appldata.h | 24 - + arch/s390/include/asm/atomic.h | 95 - + arch/s390/include/asm/bitops.h | 28 - + arch/s390/include/asm/cmpxchg.h | 7 +- + arch/s390/include/asm/cputime.h | 26 - + arch/s390/include/asm/ctl_reg.h | 14 +- + arch/s390/include/asm/elf.h | 4 - + arch/s390/include/asm/idals.h | 16 - + arch/s390/include/asm/jump_label.h | 12 +- + arch/s390/include/asm/lowcore.h | 159 -- + arch/s390/include/asm/mman.h | 2 +- + arch/s390/include/asm/mmu_context.h | 4 - + arch/s390/include/asm/percpu.h | 4 - + arch/s390/include/asm/perf_event.h | 3 - + arch/s390/include/asm/pgalloc.h | 24 - + arch/s390/include/asm/pgtable.h | 125 +- + arch/s390/include/asm/processor.h | 66 +- + arch/s390/include/asm/ptrace.h | 4 - + arch/s390/include/asm/qdio.h | 10 - + arch/s390/include/asm/runtime_instr.h | 10 +- + arch/s390/include/asm/rwsem.h | 81 - + arch/s390/include/asm/setup.h | 35 - + arch/s390/include/asm/sfp-util.h | 10 - + arch/s390/include/asm/sparsemem.h | 9 - + arch/s390/include/asm/switch_to.h | 21 +- + arch/s390/include/asm/thread_info.h | 9 - + arch/s390/include/asm/tlb.h | 4 - + arch/s390/include/asm/tlbflush.h | 7 - + arch/s390/include/asm/types.h | 17 - + arch/s390/include/asm/unistd.h | 8 - + arch/s390/include/asm/vdso.h | 2 - + arch/s390/kernel/Makefile | 22 +- + arch/s390/kernel/asm-offsets.c | 4 - + arch/s390/kernel/base.S | 76 - + arch/s390/kernel/cpcmd.c | 10 - + arch/s390/kernel/diag.c | 15 - + arch/s390/kernel/dis.c | 48 +- + arch/s390/kernel/dumpstack.c | 26 +- + arch/s390/kernel/early.c | 69 - + arch/s390/kernel/entry.S | 1005 ++++++----- + arch/s390/kernel/entry64.S | 1059 ----------- + arch/s390/kernel/head.S | 49 - + arch/s390/kernel/head31.S | 106 -- + arch/s390/kernel/head_kdump.S | 8 - + arch/s390/kernel/ipl.c | 2 - + arch/s390/kernel/module.c | 12 - + arch/s390/kernel/nmi.c | 92 +- + arch/s390/kernel/perf_cpum_sf.c | 7 +- + arch/s390/kernel/pgm_check.S | 22 +- + arch/s390/kernel/process.c | 29 +- + arch/s390/kernel/ptrace.c | 46 +- + arch/s390/kernel/reipl.S | 133 +- + arch/s390/kernel/reipl64.S | 155 -- + arch/s390/kernel/relocate_kernel.S | 63 +- + arch/s390/kernel/relocate_kernel64.S | 121 -- + arch/s390/kernel/sclp.S | 10 - + arch/s390/kernel/setup.c | 72 - + arch/s390/kernel/signal.c | 10 - + arch/s390/kernel/smp.c | 33 - + arch/s390/kernel/sys_s390.c | 49 - + arch/s390/kernel/syscalls.S | 716 ++++---- + arch/s390/kernel/traps.c | 155 +- + arch/s390/kernel/vdso.c | 16 +- + arch/s390/kernel/vmlinux.lds.S | 7 - + arch/s390/lib/Makefile | 3 +- + arch/s390/lib/div64.c | 147 -- + arch/s390/lib/mem32.S | 92 - + arch/s390/lib/qrnnd.S | 78 - + arch/s390/lib/uaccess.c | 136 +- + arch/s390/lib/ucmpdi2.c | 26 - + arch/s390/math-emu/Makefile | 7 - + arch/s390/math-emu/math.c | 2255 ------------------------ + arch/s390/mm/dump_pagetables.c | 24 +- + arch/s390/mm/extmem.c | 14 - + arch/s390/mm/fault.c | 36 - + arch/s390/mm/gup.c | 4 - + arch/s390/mm/init.c | 5 - + arch/s390/mm/mem_detect.c | 4 - + arch/s390/mm/mmap.c | 25 - + arch/s390/mm/pageattr.c | 2 +- + arch/s390/mm/pgtable.c | 8 - + arch/s390/mm/vmem.c | 10 +- + arch/s390/oprofile/Makefile | 2 +- + arch/s390/oprofile/init.c | 11 - + arch/s390/pci/pci.c | 3 +- + drivers/s390/block/dasd.c | 13 +- + drivers/s390/block/dasd_diag.h | 42 - + drivers/s390/block/dasd_eckd.c | 6 - + drivers/s390/block/dasd_fba.c | 2 - + drivers/s390/char/Kconfig | 2 +- + drivers/s390/char/sclp_sdias.c | 4 - + drivers/s390/char/zcore.c | 32 - + drivers/s390/cio/cio.c | 2 - + drivers/s390/cio/qdio.h | 7 - + drivers/s390/cio/qdio_setup.c | 3 - + drivers/s390/crypto/ap_bus.c | 24 +- + drivers/s390/net/ctcm_mpc.c | 12 - + 106 files changed, 1221 insertions(+), 7083 deletions(-) + rename arch/s390/boot/compressed/{head64.S => head.S} (100%) + delete mode 100644 arch/s390/boot/compressed/head31.S + delete mode 100644 arch/s390/kernel/entry64.S + delete mode 100644 arch/s390/kernel/head31.S + delete mode 100644 arch/s390/kernel/reipl64.S + delete mode 100644 arch/s390/kernel/relocate_kernel64.S + delete mode 100644 arch/s390/lib/div64.c + delete mode 100644 arch/s390/lib/mem32.S + delete mode 100644 arch/s390/lib/qrnnd.S + delete mode 100644 arch/s390/lib/ucmpdi2.c + delete mode 100644 arch/s390/math-emu/Makefile + delete mode 100644 arch/s390/math-emu/math.c +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 (740e1433f50e tile: change MAINTAINERS website from tilera.com to ezchip.com) +$ git merge tile/master +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 (1f2fdbd0078c xtensa: disable link optimization) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (a742994aa2e2 Btrfs: don't remove extents and xattrs when logging new names) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default) +$ git merge ceph/master +Resolved 'fs/ceph/inode.c' using previous resolution. +Resolved 'fs/ceph/snap.c' using previous resolution. +Resolved 'fs/ceph/super.c' using previous resolution. +Resolved 'fs/ceph/super.h' using previous resolution. +Resolved 'include/linux/ceph/libceph.h' using previous resolution. +Resolved 'net/ceph/auth_x.c' using previous resolution. +Resolved 'net/ceph/ceph_common.c' using previous resolution. +Auto-merging net/ceph/ceph_common.c +CONFLICT (content): Merge conflict in net/ceph/ceph_common.c +Auto-merging net/ceph/auth_x.c +CONFLICT (content): Merge conflict in net/ceph/auth_x.c +Auto-merging include/linux/ceph/libceph.h +CONFLICT (content): Merge conflict in include/linux/ceph/libceph.h +Auto-merging fs/ceph/super.h +CONFLICT (content): Merge conflict in fs/ceph/super.h +Auto-merging fs/ceph/super.c +CONFLICT (content): Merge conflict in fs/ceph/super.c +Auto-merging fs/ceph/snap.c +CONFLICT (content): Merge conflict in fs/ceph/snap.c +Auto-merging fs/ceph/inode.c +CONFLICT (content): Merge conflict in fs/ceph/inode.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3baad19e1b39] Merge remote-tracking branch 'ceph/master' +$ git diff -M --stat --summary HEAD^.. +Merging cifs/for-next (121672682b23 cifs: fix use-after-free bug in find_writable_file) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 9 ++++++++ + fs/cifs/cifsglob.h | 7 ++++++ + fs/cifs/connect.c | 10 +++++++++ + fs/cifs/file.c | 1 + + fs/cifs/smb2ops.c | 25 ++++++++++++++++++++- + fs/cifs/smb2pdu.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++--- + fs/cifs/smb2pdu.h | 50 +++++++++++++++++++++++++++++++++++------- + 7 files changed, 154 insertions(+), 12 deletions(-) +Merging ecryptfs/next (6d65261a09ad eCryptfs: don't pass fs-specific ioctl commands through) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (6981498d7956 udf: remove bool assignment to 0/1) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (6f30b7e37a82 ext4: fix indirect punch hole corruption) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (ee2383f796e0 f2fs: report -ENOENT for unreached data indices) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.txt | 4 + + fs/f2fs/checkpoint.c | 35 ++- + fs/f2fs/data.c | 603 +++++++++++++++++++++++++++++++++---- + fs/f2fs/debug.c | 22 +- + fs/f2fs/dir.c | 34 ++- + fs/f2fs/f2fs.h | 122 ++++++-- + fs/f2fs/file.c | 41 ++- + fs/f2fs/gc.c | 6 +- + fs/f2fs/inline.c | 20 +- + fs/f2fs/inode.c | 8 + + fs/f2fs/namei.c | 2 + + fs/f2fs/node.c | 13 +- + fs/f2fs/node.h | 1 + + fs/f2fs/recovery.c | 8 +- + fs/f2fs/segment.c | 11 +- + fs/f2fs/super.c | 18 +- + fs/xfs/libxfs/xfs_fs.h | 8 +- + include/linux/f2fs_fs.h | 2 +- + include/trace/events/f2fs.h | 134 +++++++++ + include/uapi/linux/fs.h | 8 + + 20 files changed, 952 insertions(+), 148 deletions(-) +Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.) +$ git merge fscache/fscache +Resolved 'fs/fscache/object.c' using previous resolution. +Auto-merging fs/fscache/object.c +CONFLICT (content): Merge conflict in fs/fscache/object.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fb37c2d19880] Merge remote-tracking branch 'fscache/fscache' +$ git diff -M --stat --summary HEAD^.. +Merging fuse/for-next (6a57f2a7bb7d fuse: write inode even if no FLUSH) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dev.c | 7 +++++-- + fs/fuse/file.c | 6 +++--- + 2 files changed, 8 insertions(+), 5 deletions(-) +Merging gfs2/for-next (89d4899e65a7 GFS2: Move gfs2_file_splice_write outside of #ifdef) +$ git merge gfs2/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + fs/gfs2/acl.c | 6 +----- + fs/gfs2/file.c | 20 ++++++++++++++++++-- + 3 files changed, 21 insertions(+), 9 deletions(-) +Merging jfs/jfs-next (7d2ac45611b0 jfs: %pf is only for function pointers) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/super.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nfs/linux-next (9eccca084320 Linux 4.0-rc3) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (c517d838eb7d Linux 4.0-rc1) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging overlayfs/overlayfs-next (4330397e4e8a ovl: discard independent cursor in readdir()) +$ 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 (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (b388e6a7a6ba UBI: fix missing brace control flow) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/eba.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging xfs/for-next (88e8fda99a4c Merge branch 'xfs-mmap-lock' into for-next) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/xfs.txt | 29 +- + fs/xfs/libxfs/xfs_alloc.c | 104 +++-- + fs/xfs/libxfs/xfs_bmap.c | 174 ++++---- + fs/xfs/libxfs/xfs_btree.c | 24 +- + fs/xfs/libxfs/xfs_dir2_data.c | 39 +- + fs/xfs/libxfs/xfs_format.h | 62 --- + fs/xfs/libxfs/xfs_ialloc.c | 48 +- + fs/xfs/libxfs/xfs_sb.c | 20 +- + fs/xfs/xfs_bmap_util.c | 31 +- + fs/xfs/xfs_buf_item.c | 4 +- + fs/xfs/xfs_discard.c | 2 +- + fs/xfs/xfs_error.h | 8 +- + fs/xfs/xfs_file.c | 70 ++- + fs/xfs/xfs_fsops.c | 20 +- + fs/xfs/xfs_icache.c | 4 +- + fs/xfs/xfs_inode.c | 150 +++++-- + fs/xfs/xfs_inode.h | 49 +- + fs/xfs/xfs_ioctl.c | 5 +- + fs/xfs/xfs_iomap.c | 3 +- + fs/xfs/xfs_iops.c | 87 ++-- + fs/xfs/xfs_iops.h | 2 - + fs/xfs/xfs_itable.c | 2 +- + fs/xfs/xfs_linux.h | 9 - + fs/xfs/xfs_log_recover.c | 4 +- + fs/xfs/xfs_mount.c | 918 +++++--------------------------------- + fs/xfs/xfs_mount.h | 95 +--- + fs/xfs/xfs_qm.c | 13 +- + fs/xfs/xfs_super.c | 126 ++++-- + fs/xfs/xfs_super.h | 2 + + fs/xfs/xfs_symlink.c | 58 ++- + fs/xfs/xfs_trace.h | 3 + + fs/xfs/xfs_trans.c | 234 ++++++---- + 32 files changed, 884 insertions(+), 1515 deletions(-) +Merging file-locks/linux-next (65782c7629bd locks: use cmpxchg to assign i_flctx pointer) +$ git merge file-locks/linux-next +Merge made by the 'recursive' strategy. + fs/locks.c | 56 ++++++++++++++++++++++++++--------------------------- + fs/nfsd/nfs4state.c | 18 +++++++++-------- + include/linux/fs.h | 4 ++-- + 3 files changed, 39 insertions(+), 39 deletions(-) +Merging vfs/for-next (074def59bce4 dcache: return -ESTALE not -EBUSY on distributed fs race) +$ git merge vfs/for-next +Auto-merging sound/core/pcm_native.c +Auto-merging mm/shmem.c +Auto-merging kernel/printk/printk.c +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/nfs/file.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/fuse/file.c +Auto-merging fs/fuse/dev.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/ecryptfs/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Auto-merging arch/metag/include/asm/processor.h +Auto-merging arch/arc/kernel/process.c +Merge made by the 'recursive' strategy. + arch/arc/kernel/process.c | 2 - + arch/c6x/kernel/process.c | 1 - + arch/frv/kernel/signal.c | 4 - + arch/hexagon/kernel/process.c | 2 - + arch/m32r/kernel/signal.c | 2 - + arch/metag/include/asm/processor.h | 1 - + arch/microblaze/kernel/signal.c | 2 - + arch/nios2/kernel/process.c | 1 - + arch/openrisc/kernel/process.c | 1 - + arch/s390/hypfs/inode.c | 2 +- + arch/sh/kernel/signal_32.c | 4 - + arch/sh/kernel/signal_64.c | 4 - + arch/xtensa/kernel/signal.c | 5 - + drivers/char/mem.c | 2 +- + drivers/char/tile-srom.c | 1 - + drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 - + drivers/infiniband/hw/qib/qib_file_ops.c | 1 - + drivers/misc/mei/amthif.c | 1 - + drivers/misc/mei/main.c | 1 - + drivers/misc/mei/pci-me.c | 1 - + drivers/scsi/sg.c | 2 +- + drivers/staging/unisys/include/timskmod.h | 1 - + drivers/usb/gadget/function/f_fs.c | 6 +- + drivers/usb/gadget/legacy/inode.c | 6 +- + fs/9p/vfs_addr.c | 2 +- + fs/affs/file.c | 2 +- + fs/afs/write.c | 1 - + fs/aio.c | 150 ++--- + fs/bfs/inode.c | 1 + + fs/block_dev.c | 1 - + fs/btrfs/file.c | 2 +- + fs/btrfs/inode.c | 1 - + fs/ceph/file.c | 3 +- + fs/dcache.c | 2 +- + fs/direct-io.c | 5 +- + fs/ecryptfs/file.c | 7 - + fs/ext2/inode.c | 2 +- + fs/ext3/inode.c | 2 +- + fs/ext4/file.c | 2 +- + fs/ext4/indirect.c | 1 - + fs/ext4/inode.c | 1 - + fs/ext4/page-io.c | 1 - + fs/f2fs/data.c | 2 +- + fs/fat/inode.c | 1 - + fs/fuse/cuse.c | 2 +- + fs/fuse/dev.c | 1 - + fs/fuse/file.c | 55 +- + fs/fuse/fuse_i.h | 1 + + fs/gfs2/aops.c | 2 +- + fs/gfs2/file.c | 1 - + fs/hfs/inode.c | 2 +- + fs/hfsplus/inode.c | 2 +- + fs/jfs/inode.c | 2 +- + fs/namei.c | 160 +++--- + fs/nfs/direct.c | 4 +- + fs/nfs/file.c | 1 - + fs/nilfs2/inode.c | 2 +- + fs/ntfs/Makefile | 2 +- + fs/ntfs/file.c | 784 +++++++++++---------------- + fs/ntfs/inode.c | 1 - + fs/ocfs2/aops.c | 1 + + fs/ocfs2/aops.h | 2 +- + fs/ocfs2/file.c | 8 +- + fs/open.c | 3 - + fs/pipe.c | 1 - + fs/read_write.c | 35 +- + fs/reiserfs/inode.c | 2 +- + fs/splice.c | 1 - + fs/stat.c | 2 +- + fs/ubifs/file.c | 1 - + fs/udf/file.c | 4 +- + fs/udf/inode.c | 2 +- + fs/xfs/xfs_aops.c | 1 - + fs/xfs/xfs_file.c | 1 - + include/linux/aio.h | 70 +-- + include/linux/fs.h | 24 +- + include/linux/security.h | 7 +- + include/linux/uio.h | 1 + + include/net/sock.h | 1 - + kernel/printk/printk.c | 4 +- + kernel/sysctl.c | 1 + + lib/iov_iter.c | 26 + + mm/filemap.c | 1 - + mm/page_io.c | 3 +- + mm/shmem.c | 2 +- + net/ipv4/raw.c | 1 - + net/socket.c | 15 +- + security/apparmor/lsm.c | 6 +- + security/capability.c | 2 +- + security/security.c | 6 +- + security/selinux/hooks.c | 12 +- + security/smack/smack_lsm.c | 13 +- + security/tomoyo/common.h | 4 +- + security/tomoyo/file.c | 4 +- + security/tomoyo/realpath.c | 6 +- + security/tomoyo/tomoyo.c | 5 +- + sound/core/pcm_native.c | 2 +- + 97 files changed, 640 insertions(+), 905 deletions(-) +$ git am -3 ../patches/0001-ext4-iov_iter_count-needs-linux-uio.h.patch +Applying: ext4: iov_iter_count needs linux/uio.h +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ext4/indirect.c +$ git add -A . +$ git commit -v -a --amend +[master 38c2529cd524] Merge remote-tracking branch 'vfs/for-next' + Date: Mon Mar 16 11:47:34 2015 +1100 +Merging pci/next (c517d838eb7d Linux 4.0-rc1) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (1034f72defef Merge branch 'for-4.1/upstream' into for-next) +$ git merge hid/for-next +Removing drivers/hid/hid-huion.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-hid | 10 + + .../ABI/testing/sysfs-driver-hid-logitech-lg4ff | 45 ++ + drivers/hid/Kconfig | 10 +- + drivers/hid/Makefile | 1 - + drivers/hid/hid-core.c | 22 + + drivers/hid/hid-debug.c | 1 + + drivers/hid/hid-huion.c | 290 ---------- + drivers/hid/hid-ids.h | 3 + + drivers/hid/hid-input.c | 23 + + drivers/hid/hid-kye.c | 140 +++++ + drivers/hid/hid-lg.c | 7 + + drivers/hid/hid-lg.h | 12 - + drivers/hid/hid-lg4ff.c | 600 ++++++++++++++++++--- + drivers/hid/hid-lg4ff.h | 18 + + drivers/hid/hid-multitouch.c | 26 +- + drivers/hid/hid-rmi.c | 177 +++++- + drivers/hid/hid-sensor-hub.c | 196 ++++--- + drivers/hid/hid-sony.c | 31 +- + drivers/hid/hid-steelseries.c | 1 - + drivers/hid/hid-tivo.c | 1 + + drivers/hid/hid-uclogic.c | 326 ++++++++++- + drivers/hid/i2c-hid/i2c-hid.c | 68 ++- + drivers/hid/usbhid/hid-quirks.c | 6 +- + drivers/hid/wacom.h | 8 +- + drivers/hid/wacom_sys.c | 72 ++- + drivers/hid/wacom_wac.c | 319 ++++++++--- + drivers/hid/wacom_wac.h | 8 + + drivers/iio/accel/hid-sensor-accel-3d.c | 3 +- + .../iio/common/hid-sensors/hid-sensor-attributes.c | 24 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 13 +- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 3 +- + drivers/iio/light/hid-sensor-als.c | 3 +- + drivers/iio/light/hid-sensor-prox.c | 3 +- + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 3 +- + drivers/iio/orientation/hid-sensor-incl-3d.c | 3 +- + drivers/iio/pressure/hid-sensor-press.c | 3 +- + drivers/rtc/rtc-hid-sensor-time.c | 2 +- + include/linux/hid-sensor-hub.h | 55 +- + include/linux/hid-sensor-ids.h | 2 + + include/linux/hid.h | 2 + + include/uapi/linux/input.h | 4 + + samples/hidraw/Makefile | 2 + + samples/hidraw/hid-example.c | 6 +- + 43 files changed, 1930 insertions(+), 622 deletions(-) + delete mode 100644 drivers/hid/hid-huion.c + create mode 100644 drivers/hid/hid-lg4ff.h +Merging i2c/i2c/for-next (58b59e0f2462 i2c: pca954x: improve usage of gpiod API) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/busses/i2c-i801.c | 51 ++++++++++++++----------------------- + drivers/i2c/muxes/i2c-mux-pca954x.c | 6 ++--- + 2 files changed, 22 insertions(+), 35 deletions(-) +Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (f6906edeac16 hwmon: (gpio-fan) Fix build with CONFIG_THERMAL=m and SENSORS_GPIO_FAN=y) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-fan.txt | 19 +- + Documentation/hwmon/it87 | 26 +- + Documentation/hwmon/jc42 | 8 +- + Documentation/hwmon/nct7904 | 60 +++ + drivers/hwmon/Kconfig | 18 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/coretemp.c | 11 +- + drivers/hwmon/gpio-fan.c | 127 ++++- + drivers/hwmon/ibmpex.c | 19 +- + drivers/hwmon/it87.c | 129 +++-- + drivers/hwmon/jc42.c | 16 +- + drivers/hwmon/nct7904.c | 593 +++++++++++++++++++++ + drivers/hwmon/pwm-fan.c | 173 +++++- + 13 files changed, 1061 insertions(+), 139 deletions(-) + create mode 100644 Documentation/hwmon/nct7904 + create mode 100644 drivers/hwmon/nct7904.c +Merging v4l-dvb/master (48b777c0833b Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/usb/gspca/topro.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging kbuild/for-next (94100b52d1c0 Merge branch 'kbuild/kconfig' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/lto-build | 173 ++++++++++++++++++++++++++++++++++++++++ + Makefile | 19 ++++- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 +++++++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.lto | 84 +++++++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/kconfig/confdata.c | 5 ++ + scripts/kconfig/expr.c | 22 ++--- + scripts/kconfig/expr.h | 5 -- + scripts/kconfig/gconf.c | 24 ------ + scripts/kconfig/lkc.h | 14 ---- + scripts/kconfig/lkc_proto.h | 85 ++++++++++---------- + scripts/kconfig/menu.c | 4 +- + scripts/kconfig/merge_config.sh | 2 +- + scripts/kconfig/symbol.c | 42 +++++----- + scripts/kconfig/util.c | 10 --- + scripts/link-vmlinux.sh | 2 +- + 19 files changed, 437 insertions(+), 140 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto +Merging kconfig/for-next (bfa76d495765 Linux 3.19) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (29200f12a116 sata-fsl: Apply link speed limits) +$ git merge libata/for-next +Already up-to-date. +Merging pm/linux-next (1983638243b9 Merge branch 'pm-cpuidle' into linux-next) +$ git merge pm/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 7 ++ + Documentation/power/basic-pm-debugging.txt | 10 ++- + MAINTAINERS | 9 +++ + drivers/acpi/ec.c | 120 ++++++++++++++++++++--------- + drivers/acpi/sysfs.c | 2 +- + drivers/acpi/video.c | 19 +++-- + drivers/cpuidle/cpuidle-mvebu-v7.c | 12 +-- + drivers/powercap/intel_rapl.c | 54 +++++++++---- + kernel/power/suspend.c | 13 +++- + 9 files changed, 176 insertions(+), 70 deletions(-) +Merging idle/next (210109f4a19a Merge branches 'turbostat', 'sfi' and 'cpuidle' into release) +$ git merge idle/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging thermal/next (5912e264d9ee Merge branch 'tmon-fixes' of .git into next) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (3d1b493e9886 Merge branch 'work-fixes' into work-next) +$ git merge thermal-soc/next +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 | 31 +- + drivers/acpi/thermal.c | 9 +- + drivers/platform/x86/acerhdf.c | 3 +- + drivers/thermal/Kconfig | 36 ++ + drivers/thermal/Makefile | 2 + + drivers/thermal/cpu_cooling.c | 610 ++++++++++++++++++++- + 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 | 538 ++++++++++++++++++ + drivers/thermal/qcom-spmi-temp-alarm.c | 309 +++++++++++ + drivers/thermal/thermal_core.c | 210 ++++++- + drivers/thermal/thermal_core.h | 11 + + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 3 +- + 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 +++ + 24 files changed, 2486 insertions(+), 78 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 (013489fea669 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + arch/arm/mach-shmobile/board-armadillo800eva.c | 20 +- + arch/arm/mach-shmobile/board-bockw.c | 14 +- + arch/arm/mach-shmobile/board-kzm9g.c | 20 +- + arch/arm/mach-shmobile/board-marzen.c | 10 +- + arch/sh/boards/board-sh7757lcr.c | 9 +- + arch/sh/boards/mach-ap325rxa/setup.c | 9 +- + arch/sh/boards/mach-ecovec24/setup.c | 20 +- + arch/sh/boards/mach-kfr2r09/setup.c | 10 +- + arch/sh/boards/mach-migor/setup.c | 9 +- + arch/sh/boards/mach-se/7724/setup.c | 17 +- + drivers/dma/at_hdmac.c | 359 +++++++++++++++++++------ + drivers/dma/at_hdmac_regs.h | 7 +- + drivers/dma/dma-jz4740.c | 2 +- + drivers/dma/dmaengine.c | 14 - + drivers/dma/qcom_bam_dma.c | 14 +- + drivers/dma/s3c24xx-dma.c | 4 +- + drivers/dma/sh/shdma-base.c | 73 +++-- + drivers/mmc/host/sh_mmcif.c | 13 +- + drivers/mmc/host/sh_mobile_sdhi.c | 26 +- + drivers/mmc/host/tmio_mmc.h | 4 - + drivers/mmc/host/tmio_mmc_dma.c | 10 +- + drivers/mtd/nand/sh_flctl.c | 2 - + drivers/spi/spi-rspi.c | 1 - + drivers/spi/spi-sh-msiof.c | 1 - + include/linux/dmaengine.h | 32 --- + include/linux/mfd/tmio.h | 2 + + include/linux/mmc/sh_mobile_sdhi.h | 10 - + include/linux/shdma-base.h | 1 + + sound/soc/sh/fsi.c | 18 +- + 29 files changed, 445 insertions(+), 286 deletions(-) +Merging net-next/master (5a2f78dd51d9 Merge branch 'rhashtable-next') +$ git merge net-next/master +Recorded preimage for 'net/ipv4/inet_diag.c' +Resolved 'net/socket.c' using previous resolution. +Auto-merging net/socket.c +CONFLICT (content): Merge conflict in net/socket.c +Auto-merging net/sched/cls_u32.c +Auto-merging net/ipv6/xfrm6_policy.c +Auto-merging net/ipv4/tcp_cong.c +Auto-merging net/ipv4/raw.c +Auto-merging net/ipv4/inet_diag.c +CONFLICT (content): Merge conflict in net/ipv4/inet_diag.c +Auto-merging net/core/sock.c +Auto-merging net/core/skbuff.c +Removing kernel/bpf/test_stub.c +Auto-merging include/net/vxlan.h +Auto-merging include/net/sock.h +Auto-merging include/linux/skbuff.h +Removing drivers/s390/net/claw.h +Removing drivers/s390/net/claw.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/scan.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/rs.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/coex_legacy.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/coex.c +Auto-merging drivers/net/wireless/b43/main.c +Auto-merging drivers/net/vxlan.c +Auto-merging drivers/net/ethernet/wiznet/w5300.c +Auto-merging drivers/net/ethernet/wiznet/w5100.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +Removing drivers/net/ethernet/cadence/at91_ether.c +Auto-merging arch/powerpc/net/bpf_jit_asm.S +Auto-merging arch/arm/boot/dts/sama5d3_emac.dtsi +Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi +Auto-merging arch/arm/boot/dts/at91sam9263.dtsi +Auto-merging arch/arm/boot/dts/at91sam9260.dtsi +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'net/ipv4/inet_diag.c'. +[master 9f9b429561ba] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + .../bindings/net/ieee802154/at86rf230.txt | 8 +- + Documentation/devicetree/bindings/net/macb.txt | 5 +- + Documentation/networking/ip-sysctl.txt | 10 + + Documentation/networking/ipvs-sysctl.txt | 21 + + Documentation/networking/mpls-sysctl.txt | 20 + + Documentation/networking/pktgen.txt | 62 +- + Documentation/networking/s2io.txt | 2 +- + Documentation/networking/vxge.txt | 2 +- + MAINTAINERS | 3 +- + arch/arm/boot/dts/at91sam9260.dtsi | 2 +- + arch/arm/boot/dts/at91sam9263.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x5_macb0.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x5_macb1.dtsi | 2 +- + arch/arm/boot/dts/sama5d3_emac.dtsi | 2 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/asm-compat.h | 4 + + arch/powerpc/include/asm/ppc-opcode.h | 2 + + arch/powerpc/net/Makefile | 2 +- + arch/powerpc/net/bpf_jit.h | 64 +- + arch/powerpc/net/{bpf_jit_64.S => bpf_jit_asm.S} | 70 +- + arch/powerpc/net/bpf_jit_comp.c | 46 +- + arch/s390/kernel/irq.c | 1 - + crypto/algif_hash.c | 8 +- + crypto/algif_rng.c | 4 +- + crypto/algif_skcipher.c | 8 +- + drivers/atm/nicstar.c | 90 - + drivers/bcma/Kconfig | 19 +- + drivers/bcma/Makefile | 4 +- + drivers/bcma/bcma_private.h | 47 + + drivers/bcma/driver_gpio.c | 4 +- + drivers/bcma/driver_pci.c | 26 +- + drivers/bcma/driver_pci_host.c | 1 + + drivers/bcma/driver_pcie2.c | 29 +- + drivers/bcma/host_pci.c | 43 +- + drivers/bcma/main.c | 2 +- + drivers/bluetooth/ath3k.c | 1 + + drivers/bluetooth/btmrvl_drv.h | 1 + + drivers/bluetooth/btmrvl_main.c | 14 + + drivers/bluetooth/btusb.c | 449 ++- + drivers/firewire/net.c | 13 - + drivers/isdn/i4l/isdn_net.c | 33 - + drivers/isdn/mISDN/socket.c | 7 +- + drivers/media/dvb-core/dvb_net.c | 1 - + drivers/net/arcnet/arcnet.c | 55 - + drivers/net/bonding/bond_3ad.c | 60 +- + drivers/net/bonding/bond_main.c | 39 +- + drivers/net/bonding/bond_procfs.c | 43 +- + drivers/net/can/bfin_can.c | 258 +- + drivers/net/dsa/bcm_sf2.c | 155 +- + drivers/net/dsa/bcm_sf2.h | 2 + + drivers/net/dsa/bcm_sf2_regs.h | 15 + + drivers/net/dsa/mv88e6171.c | 18 +- + drivers/net/dsa/mv88e6352.c | 79 +- + drivers/net/dsa/mv88e6xxx.c | 104 + + drivers/net/dsa/mv88e6xxx.h | 9 + + drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- + drivers/net/ethernet/altera/altera_tse_main.c | 20 +- + drivers/net/ethernet/amd/amd8111e.c | 4 +- + drivers/net/ethernet/amd/amd8111e.h | 2 +- + drivers/net/ethernet/amd/pcnet32.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 2 +- + drivers/net/ethernet/apple/mace.c | 2 +- + drivers/net/ethernet/apple/macmace.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 4 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- + drivers/net/ethernet/broadcom/Kconfig | 8 +- + drivers/net/ethernet/broadcom/bnx2.c | 29 +- + drivers/net/ethernet/broadcom/bnx2.h | 4 +- + drivers/net/ethernet/broadcom/bnx2_fw.h | 4 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 12 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 4 +- + drivers/net/ethernet/broadcom/cnic.c | 6 +- + drivers/net/ethernet/broadcom/cnic_if.h | 8 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 522 +-- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 21 +- + drivers/net/ethernet/broadcom/tg3.c | 4 +- + drivers/net/ethernet/brocade/Kconfig | 8 +- + drivers/net/ethernet/brocade/Makefile | 2 +- + drivers/net/ethernet/brocade/bna/Kconfig | 12 +- + drivers/net/ethernet/brocade/bna/Makefile | 3 +- + drivers/net/ethernet/brocade/bna/bfa_cee.c | 7 +- + drivers/net/ethernet/brocade/bna/bfa_cee.h | 7 +- + drivers/net/ethernet/brocade/bna/bfa_cs.h | 7 +- + drivers/net/ethernet/brocade/bna/bfa_defs.h | 7 +- + drivers/net/ethernet/brocade/bna/bfa_defs_cna.h | 9 +- + .../net/ethernet/brocade/bna/bfa_defs_mfg_comm.h | 7 +- + drivers/net/ethernet/brocade/bna/bfa_defs_status.h | 7 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 11 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.h | 7 +- + drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c | 9 +- + drivers/net/ethernet/brocade/bna/bfa_msgq.c | 7 +- + drivers/net/ethernet/brocade/bna/bfa_msgq.h | 7 +- + drivers/net/ethernet/brocade/bna/bfi.h | 11 +- + drivers/net/ethernet/brocade/bna/bfi_cna.h | 7 +- + drivers/net/ethernet/brocade/bna/bfi_enet.h | 7 +- + drivers/net/ethernet/brocade/bna/bfi_reg.h | 13 +- + drivers/net/ethernet/brocade/bna/bna.h | 7 +- + drivers/net/ethernet/brocade/bna/bna_enet.c | 7 +- + drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 9 +- + drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 7 +- + drivers/net/ethernet/brocade/bna/bna_types.h | 7 +- + drivers/net/ethernet/brocade/bna/bnad.c | 11 +- + drivers/net/ethernet/brocade/bna/bnad.h | 9 +- + drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 7 +- + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 7 +- + drivers/net/ethernet/brocade/bna/cna.h | 11 +- + drivers/net/ethernet/brocade/bna/cna_fwimg.c | 7 +- + drivers/net/ethernet/cadence/Kconfig | 12 +- + drivers/net/ethernet/cadence/Makefile | 1 - + drivers/net/ethernet/cadence/at91_ether.c | 481 --- + drivers/net/ethernet/cadence/macb.c | 703 +++- + drivers/net/ethernet/cadence/macb.h | 30 +- + drivers/net/ethernet/calxeda/xgmac.c | 20 +- + drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 6 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 4 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 126 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 2 +- + drivers/net/ethernet/cirrus/cs89x0.c | 2 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 8 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 2 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 2 +- + drivers/net/ethernet/emulex/benet/be.h | 52 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 203 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 23 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 2 +- + drivers/net/ethernet/emulex/benet/be_main.c | 1205 ++++--- + drivers/net/ethernet/freescale/Kconfig | 2 - + drivers/net/ethernet/freescale/fec_ptp.c | 2 +- + drivers/net/ethernet/intel/e100.c | 2 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 14 +- + drivers/net/ethernet/intel/e1000e/defines.h | 1 + + drivers/net/ethernet/intel/e1000e/e1000.h | 2 + + drivers/net/ethernet/intel/e1000e/ethtool.c | 6 +- + drivers/net/ethernet/intel/e1000e/hw.h | 6 + + drivers/net/ethernet/intel/e1000e/ich8lan.c | 776 ++++- + drivers/net/ethernet/intel/e1000e/ich8lan.h | 9 + + drivers/net/ethernet/intel/e1000e/netdev.c | 58 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 4 +- + drivers/net/ethernet/intel/e1000e/regs.h | 3 + + drivers/net/ethernet/intel/fm10k/fm10k.h | 1 + + drivers/net/ethernet/intel/fm10k/fm10k_common.c | 3 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 39 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 19 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 23 +- + drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 2 +- + drivers/net/ethernet/intel/fm10k/fm10k_type.h | 5 +- + drivers/net/ethernet/intel/fm10k/fm10k_vf.c | 14 +- + drivers/net/ethernet/intel/i40e/Makefile | 2 +- + drivers/net/ethernet/intel/i40e/i40e.h | 59 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_common.c | 285 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 17 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 48 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 478 ++- + drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 32 +- + drivers/net/ethernet/intel/i40e/i40e_fcoe.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 835 +++-- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 95 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 12 +- + drivers/net/ethernet/intel/i40e/i40e_register.h | 50 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 475 ++- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 17 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 19 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 42 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 300 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 15 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 1 + + drivers/net/ethernet/intel/i40evf/i40e_common.c | 58 +- + drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 3 +- + drivers/net/ethernet/intel/i40evf/i40e_register.h | 50 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 424 ++- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 17 +- + drivers/net/ethernet/intel/i40evf/i40e_type.h | 6 +- + drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 42 +- + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 21 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 76 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 28 +- + drivers/net/ethernet/intel/igbvf/defines.h | 128 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 83 +- + drivers/net/ethernet/intel/igbvf/igbvf.h | 103 +- + drivers/net/ethernet/intel/igbvf/mbx.c | 21 +- + drivers/net/ethernet/intel/igbvf/mbx.h | 53 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 391 +-- + drivers/net/ethernet/intel/igbvf/regs.h | 123 +- + drivers/net/ethernet/intel/igbvf/vf.c | 43 +- + drivers/net/ethernet/intel/igbvf/vf.h | 83 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 - + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 56 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 2 + + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 13 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 32 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 9 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 2 + + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 47 +- + drivers/net/ethernet/intel/ixgbevf/defines.h | 285 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 86 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 82 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 229 +- + drivers/net/ethernet/intel/ixgbevf/mbx.c | 43 +- + drivers/net/ethernet/intel/ixgbevf/mbx.h | 93 +- + drivers/net/ethernet/intel/ixgbevf/regs.h | 105 +- + drivers/net/ethernet/intel/ixgbevf/vf.c | 65 +- + drivers/net/ethernet/intel/ixgbevf/vf.h | 15 +- + drivers/net/ethernet/marvell/mvpp2.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 9 + + drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 218 ++ + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 13 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 2 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 + + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 - + drivers/net/ethernet/micrel/ksz884x.c | 2 +- + drivers/net/ethernet/moxa/moxart_ether.c | 2 +- + drivers/net/ethernet/neterion/s2io.c | 2 +- + .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 2 +- + drivers/net/ethernet/packetengines/hamachi.c | 2 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 4 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 2 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 2 +- + drivers/net/ethernet/renesas/sh_eth.c | 259 +- + drivers/net/ethernet/renesas/sh_eth.h | 23 +- + drivers/net/ethernet/rocker/rocker.c | 743 ++++- + drivers/net/ethernet/rocker/rocker.h | 31 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 12 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/farch.c | 4 +- + drivers/net/ethernet/sfc/mcdi_pcol.h | 2 +- + drivers/net/ethernet/sfc/siena_sriov.c | 2 +- + drivers/net/ethernet/sfc/vfdi.h | 4 +- + drivers/net/ethernet/smsc/smsc911x.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- + drivers/net/ethernet/sun/sungem.c | 4 +- + drivers/net/ethernet/sun/sunvnet.c | 2 + + drivers/net/ethernet/ti/cpsw.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +- + drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 4 +- + drivers/net/ethernet/via/via-rhine.c | 29 +- + drivers/net/ethernet/wiznet/w5100.c | 2 +- + drivers/net/ethernet/wiznet/w5300.c | 2 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +- + drivers/net/hamradio/6pack.c | 31 +- + drivers/net/hamradio/baycom_epp.c | 3 + + drivers/net/hamradio/bpqether.c | 3 + + drivers/net/hamradio/dmascc.c | 3 + + drivers/net/hamradio/hdlcdrv.c | 3 + + drivers/net/hamradio/mkiss.c | 44 +- + drivers/net/hamradio/scc.c | 3 + + drivers/net/hamradio/yam.c | 3 + + drivers/net/hyperv/hyperv_net.h | 1 + + drivers/net/hyperv/netvsc_drv.c | 14 + + drivers/net/hyperv/rndis_filter.c | 6 +- + drivers/net/ieee802154/at86rf230.c | 344 +- + drivers/net/ipvlan/ipvlan_main.c | 1 - + drivers/net/macvlan.c | 1 - + drivers/net/macvtap.c | 9 +- + drivers/net/netconsole.c | 5 +- + drivers/net/phy/bcm7xxx.c | 1 + + drivers/net/ppp/pppoe.c | 25 +- + drivers/net/team/team.c | 3 + + drivers/net/tun.c | 6 +- + drivers/net/usb/asix_common.c | 2 + + drivers/net/usb/catc.c | 4 +- + drivers/net/usb/cdc_mbim.c | 2 +- + drivers/net/usb/cdc_ncm.c | 3 +- + drivers/net/usb/hso.c | 13 +- + drivers/net/usb/lg-vl600.c | 2 +- + drivers/net/usb/qmi_wwan.c | 2 +- + drivers/net/usb/r8152.c | 131 +- + drivers/net/usb/sr9800.c | 1 + + drivers/net/usb/usbnet.c | 5 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 29 +- + drivers/net/vmxnet3/vmxnet3_int.h | 5 +- + drivers/net/vxlan.c | 1 - + drivers/net/wireless/airo.c | 4 +- + drivers/net/wireless/at76c50x-usb.c | 6 +- + drivers/net/wireless/ath/ath10k/ce.h | 2 +- + drivers/net/wireless/ath/ath10k/core.c | 8 +- + drivers/net/wireless/ath/ath10k/core.h | 27 + + drivers/net/wireless/ath/ath10k/debug.c | 101 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +- + drivers/net/wireless/ath/ath10k/mac.c | 166 +- + drivers/net/wireless/ath/ath10k/pci.c | 4 +- + drivers/net/wireless/ath/ath10k/wmi-ops.h | 7 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 132 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 15 + + drivers/net/wireless/ath/ath10k/wmi.c | 27 +- + drivers/net/wireless/ath/ath10k/wmi.h | 18 +- + drivers/net/wireless/ath/ath5k/base.c | 2 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +- + drivers/net/wireless/ath/ath6kl/main.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_mci.c | 158 +- + drivers/net/wireless/ath/ath9k/ar9003_mci.h | 61 +- + drivers/net/wireless/ath/ath9k/ar9003_wow.c | 61 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 1 + + drivers/net/wireless/ath/ath9k/btcoex.c | 43 +- + drivers/net/wireless/ath/ath9k/btcoex.h | 1 + + drivers/net/wireless/ath/ath9k/debug.c | 5 +- + drivers/net/wireless/ath/ath9k/gpio.c | 95 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 1 + + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +- + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/main.c | 56 +- + drivers/net/wireless/ath/ath9k/mci.c | 5 +- + drivers/net/wireless/ath/ath9k/reg.h | 275 -- + drivers/net/wireless/ath/ath9k/reg_mci.h | 310 ++ + drivers/net/wireless/ath/ath9k/reg_wow.h | 10 +- + drivers/net/wireless/ath/ath9k/xmit.c | 42 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 32 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 28 +- + drivers/net/wireless/ath/wil6210/ethtool.c | 34 +- + drivers/net/wireless/ath/wil6210/fw.c | 3 +- + drivers/net/wireless/ath/wil6210/fw_inc.c | 4 +- + drivers/net/wireless/ath/wil6210/interrupt.c | 70 +- + drivers/net/wireless/ath/wil6210/main.c | 166 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 22 +- + drivers/net/wireless/ath/wil6210/txrx.c | 123 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 34 +- + drivers/net/wireless/ath/wil6210/wmi.c | 9 +- + drivers/net/wireless/atmel.c | 16 +- + drivers/net/wireless/b43/main.c | 14 +- + drivers/net/wireless/b43legacy/main.c | 8 +- + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 166 +- + drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 25 +- + drivers/net/wireless/brcm80211/brcmfmac/core.c | 30 + + drivers/net/wireless/brcm80211/brcmfmac/flowring.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 115 +- + drivers/net/wireless/brcm80211/brcmfmac/sdio.h | 47 +- + drivers/net/wireless/brcm80211/brcmsmac/main.c | 10 +- + .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 11 +- + drivers/net/wireless/cw1200/sta.c | 2 +- + drivers/net/wireless/cw1200/txrx.c | 2 +- + drivers/net/wireless/hostap/hostap_80211_tx.c | 4 +- + drivers/net/wireless/hostap/hostap_ap.c | 8 +- + drivers/net/wireless/hostap/hostap_info.c | 2 +- + drivers/net/wireless/hostap/hostap_main.c | 5 +- + drivers/net/wireless/hostap/hostap_wlan.h | 33 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 8 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 6 +- + drivers/net/wireless/iwlegacy/4965-rs.c | 2 +- + drivers/net/wireless/iwlegacy/common.c | 2 +- + drivers/net/wireless/iwlwifi/dvm/main.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-7000.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-8000.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 18 +- + drivers/net/wireless/iwlwifi/iwl-drv.c | 68 +- + drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 46 + + drivers/net/wireless/iwlwifi/iwl-fw-file.h | 151 +- + drivers/net/wireless/iwlwifi/iwl-fw.h | 53 +- + drivers/net/wireless/iwlwifi/iwl-phy-db.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 1 - + drivers/net/wireless/iwlwifi/iwl-trans.h | 4 +- + drivers/net/wireless/iwlwifi/mvm/coex.c | 4 +- + drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 12 +- + drivers/net/wireless/iwlwifi/mvm/d3.c | 9 +- + drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 55 +- + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 6 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h | 1 + + drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 191 -- + drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h | 64 +- + drivers/net/wireless/iwlwifi/mvm/fw-api.h | 27 +- + drivers/net/wireless/iwlwifi/mvm/fw.c | 133 +- + drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 36 + + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 182 +- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 127 +- + drivers/net/wireless/iwlwifi/mvm/ops.c | 44 +- + drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 4 + + drivers/net/wireless/iwlwifi/mvm/power.c | 3 +- + drivers/net/wireless/iwlwifi/mvm/rs.c | 194 +- + drivers/net/wireless/iwlwifi/mvm/rs.h | 7 +- + drivers/net/wireless/iwlwifi/mvm/rx.c | 150 +- + drivers/net/wireless/iwlwifi/mvm/scan.c | 600 +--- + drivers/net/wireless/iwlwifi/mvm/tx.c | 4 + + drivers/net/wireless/iwlwifi/mvm/utils.c | 207 +- + drivers/net/wireless/iwlwifi/pcie/trans.c | 6 +- + drivers/net/wireless/libertas/debugfs.c | 3 +- + drivers/net/wireless/libertas/main.c | 4 +- + drivers/net/wireless/libertas_tf/main.c | 4 +- + drivers/net/wireless/mac80211_hwsim.c | 6 +- + drivers/net/wireless/mwifiex/cfg80211.c | 22 +- + drivers/net/wireless/mwifiex/decl.h | 1 + + drivers/net/wireless/mwifiex/init.c | 5 +- + drivers/net/wireless/mwifiex/main.c | 16 +- + drivers/net/wireless/mwifiex/main.h | 5 + + drivers/net/wireless/mwifiex/pcie.c | 10 +- + drivers/net/wireless/mwifiex/pcie.h | 6 +- + drivers/net/wireless/mwifiex/sdio.c | 13 +- + drivers/net/wireless/mwifiex/sdio.h | 62 +- + drivers/net/wireless/mwifiex/sta_event.c | 2 +- + drivers/net/wireless/mwifiex/txrx.c | 8 +- + drivers/net/wireless/mwifiex/util.c | 30 + + drivers/net/wireless/mwifiex/wmm.c | 2 +- + drivers/net/wireless/mwl8k.c | 2 +- + drivers/net/wireless/orinoco/wext.c | 2 +- + drivers/net/wireless/p54/fwio.c | 2 +- + drivers/net/wireless/p54/main.c | 8 +- + drivers/net/wireless/ray_cs.c | 2 +- + drivers/net/wireless/rndis_wlan.c | 28 +- + drivers/net/wireless/rtlwifi/base.h | 6 - + drivers/net/wireless/rtlwifi/cam.h | 2 - + drivers/net/wireless/rtlwifi/core.c | 6 +- + drivers/net/wireless/rtlwifi/core.h | 2 - + drivers/net/wireless/rtlwifi/efuse.h | 6 - + drivers/net/wireless/rtlwifi/rtl8188ee/def.h | 41 - + drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8188ee/phy.c | 3 +- + drivers/net/wireless/rtlwifi/rtl8188ee/rf.h | 1 - + drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 41 - + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/rf.h | 1 - + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.h | 2 - + drivers/net/wireless/rtlwifi/rtl8192cu/rf.h | 1 - + drivers/net/wireless/rtlwifi/rtl8192de/def.h | 39 - + drivers/net/wireless/rtlwifi/rtl8192ee/hw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ee/rf.h | 1 - + drivers/net/wireless/rtlwifi/rtl8192se/def.h | 1 - + drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8723ae/def.h | 41 - + drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8723ae/rf.h | 1 - + drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8723be/rf.h | 1 - + drivers/net/wireless/rtlwifi/rtl8821ae/def.h | 41 - + drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8821ae/rf.h | 1 - + drivers/net/wireless/rtlwifi/usb.c | 11 +- + drivers/net/wireless/ti/wl1251/main.c | 4 +- + drivers/net/wireless/ti/wlcore/cmd.c | 4 +- + drivers/net/xen-netback/interface.c | 2 +- + drivers/of/of_mdio.c | 3 +- + drivers/s390/net/Kconfig | 13 +- + drivers/s390/net/Makefile | 1 - + drivers/s390/net/claw.c | 3377 -------------------- + drivers/s390/net/claw.h | 348 -- + drivers/s390/net/qeth_core_main.c | 5 +- + drivers/ssb/main.c | 2 + + drivers/vhost/net.c | 6 +- + include/linux/bcma/bcma.h | 12 + + include/linux/bcma/bcma_driver_chipcommon.h | 11 - + include/linux/bcma/bcma_driver_gmac_cmn.h | 6 - + include/linux/bcma/bcma_driver_mips.h | 15 - + include/linux/bcma/bcma_driver_pci.h | 6 +- + include/linux/bcma/bcma_driver_pcie2.h | 4 +- + include/linux/bpf.h | 54 +- + include/linux/brcmphy.h | 1 + + include/linux/etherdevice.h | 1 - + include/linux/filter.h | 6 +- + include/linux/ieee802154.h | 14 +- + include/linux/if_bridge.h | 1 + + include/linux/if_pppox.h | 2 + + include/linux/igmp.h | 2 + + include/linux/inet_diag.h | 43 +- + include/linux/mlx4/cmd.h | 13 + + include/linux/mlx4/device.h | 3 +- + include/linux/net.h | 10 +- + include/linux/netdevice.h | 44 +- + include/linux/netfilter_bridge.h | 51 - + include/linux/of_mdio.h | 7 + + include/linux/of_net.h | 8 + + include/linux/rhashtable.h | 29 +- + include/linux/skbuff.h | 5 +- + include/linux/sock_diag.h | 4 +- + include/linux/socket.h | 2 + + include/linux/spi/at86rf230.h | 1 + + include/linux/tcp.h | 1 - + include/linux/usb/usbnet.h | 12 + + include/net/af_vsock.h | 4 +- + include/net/arp.h | 20 +- + include/net/ax25.h | 5 +- + include/net/bluetooth/bluetooth.h | 25 +- + include/net/bluetooth/hci.h | 22 +- + include/net/bluetooth/hci_core.h | 205 +- + include/net/bluetooth/mgmt.h | 9 +- + include/net/bond_3ad.h | 29 + + include/net/cfg80211.h | 4 +- + include/net/dcbnl.h | 3 + + include/net/dn_neigh.h | 1 + + include/net/dsa.h | 21 + + include/net/dst_ops.h | 1 - + include/net/fib_rules.h | 11 +- + include/net/genetlink.h | 4 +- + include/net/inet_common.h | 7 +- + include/net/inet_connection_sock.h | 2 + + include/net/inet_hashtables.h | 4 +- + include/net/inet_sock.h | 8 + + include/net/inet_timewait_sock.h | 1 + + include/net/ip_fib.h | 70 +- + include/net/ip_vs.h | 69 +- + include/net/ipv6.h | 8 + + include/net/mac802154.h | 9 +- + include/net/ndisc.h | 19 +- + include/net/neighbour.h | 66 +- + include/net/net_namespace.h | 58 +- + include/net/netfilter/ipv4/nf_reject.h | 8 +- + include/net/netfilter/ipv6/nf_reject.h | 13 +- + include/net/netfilter/nf_conntrack.h | 5 +- + include/net/netfilter/nf_tables.h | 176 +- + include/net/netns/ipv4.h | 13 +- + include/net/netns/ipv6.h | 1 + + include/net/netns/mpls.h | 17 + + include/net/netns/x_tables.h | 1 + + include/net/ping.h | 7 +- + include/net/request_sock.h | 13 + + include/net/sch_generic.h | 4 +- + include/net/sock.h | 50 +- + include/net/switchdev.h | 26 + + include/net/tcp.h | 15 +- + include/net/tcp_states.h | 4 +- + include/net/udp.h | 24 +- + include/net/vxlan.h | 2 +- + include/net/xfrm.h | 8 +- + include/uapi/linux/bpf.h | 3 + + include/uapi/linux/dcbnl.h | 66 + + include/uapi/linux/if_addr.h | 1 + + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/ip_vs.h | 7 +- + include/uapi/linux/netfilter/nf_tables.h | 1 + + include/uapi/linux/pkt_cls.h | 2 + + include/uapi/linux/rtnetlink.h | 12 + + include/uapi/linux/tipc_netlink.h | 9 + + kernel/bpf/Makefile | 3 - + kernel/bpf/arraymap.c | 6 +- + kernel/bpf/core.c | 5 + + kernel/bpf/hashtab.c | 6 +- + kernel/bpf/helpers.c | 6 +- + kernel/bpf/syscall.c | 9 +- + kernel/bpf/test_stub.c | 78 - + kernel/bpf/verifier.c | 22 +- + lib/rhashtable.c | 649 ++-- + lib/test_rhashtable.c | 2 +- + net/6lowpan/Kconfig | 57 +- + net/6lowpan/Makefile | 13 +- + net/6lowpan/iphc.c | 200 +- + net/6lowpan/nhc.c | 241 ++ + net/6lowpan/nhc.h | 146 + + net/6lowpan/nhc_dest.c | 28 + + net/6lowpan/nhc_fragment.c | 27 + + net/6lowpan/nhc_hop.c | 27 + + net/6lowpan/nhc_ipv6.c | 27 + + net/6lowpan/nhc_mobility.c | 27 + + net/6lowpan/nhc_routing.c | 27 + + net/6lowpan/nhc_udp.c | 157 + + net/802/fc.c | 21 - + net/802/fddi.c | 26 - + net/802/hippi.c | 28 - + net/8021q/vlan_dev.c | 37 +- + net/9p/trans_fd.c | 4 +- + net/Makefile | 2 +- + net/appletalk/aarp.c | 6 +- + net/appletalk/ddp.c | 7 +- + net/atm/common.c | 7 +- + net/atm/common.h | 7 +- + net/atm/lec.c | 4 +- + net/atm/signaling.c | 24 - + net/ax25/af_ax25.c | 7 +- + net/ax25/ax25_ip.c | 30 +- + net/batman-adv/gateway_client.c | 19 +- + net/bluetooth/Kconfig | 8 + + net/bluetooth/Makefile | 3 +- + net/bluetooth/a2mp.c | 44 +- + net/bluetooth/a2mp.h | 8 - + net/bluetooth/af_bluetooth.c | 20 +- + net/bluetooth/bnep/netdev.c | 2 +- + net/bluetooth/hci_conn.c | 34 +- + net/bluetooth/hci_core.c | 288 +- + net/bluetooth/hci_debugfs.c | 10 +- + net/bluetooth/hci_debugfs.h | 22 + + net/bluetooth/hci_event.c | 169 +- + net/bluetooth/hci_request.c | 40 +- + net/bluetooth/hci_sock.c | 163 +- + net/bluetooth/l2cap_core.c | 50 +- + net/bluetooth/l2cap_sock.c | 12 +- + net/bluetooth/mgmt.c | 1959 ++++++------ + net/bluetooth/rfcomm/sock.c | 10 +- + net/bluetooth/sco.c | 33 +- + net/bluetooth/smp.c | 96 +- + net/bridge/br_device.c | 10 +- + net/bridge/br_forward.c | 7 +- + net/bridge/br_input.c | 17 +- + net/bridge/br_netfilter.c | 83 +- + net/bridge/br_netlink.c | 95 +- + net/bridge/br_nf_core.c | 1 - + net/bridge/br_private.h | 6 + + net/bridge/br_sysfs_if.c | 2 + + net/bridge/netfilter/nft_reject_bridge.c | 84 +- + net/caif/caif_socket.c | 17 +- + net/can/bcm.c | 9 +- + net/can/raw.c | 13 +- + net/compat.c | 10 +- + net/core/dev.c | 2 - + net/core/ethtool.c | 2 +- + net/core/fib_rules.c | 25 +- + net/core/filter.c | 116 +- + net/core/neighbour.c | 97 +- + net/core/net-sysfs.c | 25 + + net/core/net_namespace.c | 11 - + net/core/skbuff.c | 54 +- + net/core/sock.c | 88 +- + net/core/sock_diag.c | 37 +- + net/dcb/dcbnl.c | 44 +- + net/dccp/dccp.h | 8 +- + net/dccp/diag.c | 7 +- + net/dccp/ipv4.c | 3 + + net/dccp/ipv6.c | 2 + + net/dccp/probe.c | 3 +- + net/dccp/proto.c | 7 +- + net/decnet/af_decnet.c | 7 +- + net/decnet/dn_neigh.c | 112 +- + net/decnet/dn_route.c | 10 - + net/dsa/Kconfig | 1 + + net/dsa/dsa.c | 251 +- + net/dsa/dsa_priv.h | 9 +- + net/dsa/slave.c | 213 +- + net/ethernet/eth.c | 38 +- + net/ieee802154/6lowpan/core.c | 8 +- + net/ieee802154/core.c | 6 +- + net/ieee802154/nl-mac.c | 1 - + net/ieee802154/socket.c | 21 +- + net/ieee802154/sysfs.c | 49 - + net/ipv4/af_inet.c | 13 +- + net/ipv4/arp.c | 112 +- + net/ipv4/devinet.c | 31 + + net/ipv4/fib_frontend.c | 130 +- + net/ipv4/fib_lookup.h | 4 +- + net/ipv4/fib_rules.c | 23 +- + net/ipv4/fib_semantics.c | 7 +- + net/ipv4/fib_trie.c | 1758 +++++----- + net/ipv4/igmp.c | 65 +- + net/ipv4/inet_connection_sock.c | 2 + + net/ipv4/inet_diag.c | 356 +-- + net/ipv4/inet_hashtables.c | 5 +- + net/ipv4/inet_timewait_sock.c | 4 +- + net/ipv4/ipmr.c | 4 +- + net/ipv4/netfilter/Kconfig | 38 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 7 + + net/ipv4/netfilter/ipt_REJECT.c | 17 +- + net/ipv4/netfilter/nf_reject_ipv4.c | 25 +- + net/ipv4/netfilter/nft_reject_ipv4.c | 3 +- + net/ipv4/ping.c | 7 +- + net/ipv4/raw.c | 7 +- + net/ipv4/route.c | 2 - + net/ipv4/syncookies.c | 4 + + net/ipv4/sysctl_net_ipv4.c | 14 + + net/ipv4/tcp.c | 10 +- + net/ipv4/tcp_cong.c | 2 +- + net/ipv4/tcp_diag.c | 4 +- + net/ipv4/tcp_fastopen.c | 1 - + net/ipv4/tcp_input.c | 4 + + net/ipv4/tcp_ipv4.c | 11 +- + net/ipv4/tcp_metrics.c | 137 +- + net/ipv4/tcp_offload.c | 4 +- + net/ipv4/tcp_output.c | 79 +- + net/ipv4/tcp_timer.c | 1 + + net/ipv4/udp.c | 19 +- + net/ipv4/udp_diag.c | 22 +- + net/ipv4/udp_impl.h | 4 +- + net/ipv4/xfrm4_policy.c | 1 - + net/ipv6/addrconf.c | 38 +- + net/ipv6/addrlabel.c | 11 +- + net/ipv6/af_inet6.c | 2 +- + net/ipv6/ip6_flowlabel.c | 3 +- + net/ipv6/ip6_tunnel.c | 6 - + net/ipv6/ip6mr.c | 4 +- + net/ipv6/mcast.c | 60 +- + net/ipv6/ndisc.c | 8 + + net/ipv6/netfilter/Kconfig | 18 +- + net/ipv6/netfilter/nf_reject_ipv6.c | 37 +- + net/ipv6/ping.c | 3 +- + net/ipv6/raw.c | 10 +- + net/ipv6/route.c | 18 +- + net/ipv6/syncookies.c | 2 + + net/ipv6/tcp_ipv6.c | 7 +- + net/ipv6/tcpv6_offload.c | 4 +- + net/ipv6/udp.c | 10 +- + net/ipv6/udp_impl.h | 7 +- + net/ipv6/xfrm6_policy.c | 1 - + net/ipx/af_ipx.c | 7 +- + net/irda/af_irda.c | 29 +- + net/iucv/af_iucv.c | 8 +- + net/key/af_key.c | 6 +- + net/l2tp/l2tp_eth.c | 2 +- + net/l2tp/l2tp_ip.c | 4 +- + net/l2tp/l2tp_ip6.c | 8 +- + net/l2tp/l2tp_ppp.c | 7 +- + net/llc/af_llc.c | 7 +- + net/mac80211/cfg.c | 2 +- + net/mac80211/ibss.c | 2 +- + net/mac80211/mesh.c | 2 +- + net/mac80211/mlme.c | 10 +- + net/mac802154/util.c | 13 +- + net/mpls/Kconfig | 21 + + net/mpls/Makefile | 3 + + net/mpls/af_mpls.c | 1023 ++++++ + net/mpls/internal.h | 59 + + net/netfilter/Kconfig | 22 +- + net/netfilter/ipvs/ip_vs_core.c | 69 +- + net/netfilter/ipvs/ip_vs_ctl.c | 182 +- + net/netfilter/ipvs/ip_vs_est.c | 102 +- + net/netfilter/ipvs/ip_vs_sync.c | 21 +- + net/netfilter/nf_conntrack_amanda.c | 10 +- + net/netfilter/nf_tables_api.c | 7 +- + net/netfilter/nf_tables_core.c | 105 +- + net/netfilter/nft_compat.c | 9 + + net/netfilter/nft_reject_inet.c | 6 +- + net/netfilter/xt_set.c | 4 +- + net/netfilter/xt_string.c | 3 +- + net/netlink/af_netlink.c | 6 +- + net/netrom/af_netrom.c | 7 +- + net/netrom/nr_dev.c | 31 - + net/nfc/llcp_sock.c | 8 +- + net/nfc/rawsock.c | 7 +- + net/openvswitch/Kconfig | 1 + + net/openvswitch/datapath.c | 4 +- + net/openvswitch/datapath.h | 4 +- + net/packet/af_packet.c | 46 +- + net/packet/internal.h | 4 +- + net/phonet/datagram.c | 8 +- + net/phonet/pep.c | 8 +- + net/phonet/socket.c | 6 +- + net/rds/rds.h | 7 +- + net/rds/recv.c | 4 +- + net/rds/send.c | 3 +- + net/rose/af_rose.c | 7 +- + net/rose/rose_dev.c | 53 +- + net/rxrpc/af_rxrpc.c | 7 +- + net/rxrpc/ar-internal.h | 10 +- + net/rxrpc/ar-output.c | 20 +- + net/rxrpc/ar-recvmsg.c | 6 +- + net/sched/cls_api.c | 14 +- + net/sched/cls_basic.c | 6 +- + net/sched/cls_bpf.c | 221 +- + net/sched/cls_cgroup.c | 6 +- + net/sched/cls_flow.c | 6 +- + net/sched/cls_fw.c | 34 +- + net/sched/cls_route.c | 26 +- + net/sched/cls_rsvp.h | 12 +- + net/sched/cls_tcindex.c | 6 +- + net/sched/cls_u32.c | 25 +- + net/sched/em_text.c | 3 +- + net/sched/sch_api.c | 14 +- + net/sctp/protocol.c | 3 +- + net/sctp/socket.c | 8 +- + net/socket.c | 79 +- + net/switchdev/switchdev.c | 192 +- + net/tipc/Kconfig | 8 + + net/tipc/Makefile | 1 + + net/tipc/bcast.c | 53 +- + net/tipc/bearer.c | 13 +- + net/tipc/bearer.h | 17 +- + net/tipc/discover.c | 10 +- + net/tipc/eth_media.c | 8 +- + net/tipc/ib_media.c | 2 +- + net/tipc/link.c | 356 +-- + net/tipc/link.h | 17 +- + net/tipc/msg.c | 119 +- + net/tipc/msg.h | 93 +- + net/tipc/name_distr.c | 2 +- + net/tipc/node.c | 4 +- + net/tipc/node.h | 6 +- + net/tipc/socket.c | 117 +- + net/tipc/subscr.c | 23 +- + net/tipc/udp_media.c | 442 +++ + net/unix/af_unix.c | 50 +- + net/vmw_vsock/af_vsock.c | 20 +- + net/vmw_vsock/vmci_transport.c | 3 +- + net/wireless/ibss.c | 2 +- + net/wireless/nl80211.c | 4 +- + net/wireless/trace.h | 9 +- + net/wireless/wext-sme.c | 2 +- + net/x25/af_x25.c | 6 +- + samples/bpf/libbpf.h | 4 +- + samples/bpf/test_verifier.c | 5 +- + samples/pktgen/pktgen.conf-1-1 | 59 + + samples/pktgen/pktgen.conf-1-1-flows | 67 + + samples/pktgen/pktgen.conf-1-1-ip6 | 60 + + samples/pktgen/pktgen.conf-1-1-ip6-rdos | 63 + + samples/pktgen/pktgen.conf-1-1-rdos | 64 + + samples/pktgen/pktgen.conf-1-2 | 69 + + samples/pktgen/pktgen.conf-2-1 | 66 + + samples/pktgen/pktgen.conf-2-2 | 73 + + 809 files changed, 22634 insertions(+), 17316 deletions(-) + create mode 100644 Documentation/networking/mpls-sysctl.txt + rename arch/powerpc/net/{bpf_jit_64.S => bpf_jit_asm.S} (76%) + delete mode 100644 drivers/net/ethernet/cadence/at91_ether.c + create mode 100644 drivers/net/wireless/ath/ath9k/reg_mci.h + delete mode 100644 drivers/s390/net/claw.c + delete mode 100644 drivers/s390/net/claw.h + create mode 100644 include/net/netns/mpls.h + delete mode 100644 kernel/bpf/test_stub.c + create mode 100644 net/6lowpan/nhc.c + create mode 100644 net/6lowpan/nhc.h + create mode 100644 net/6lowpan/nhc_dest.c + create mode 100644 net/6lowpan/nhc_fragment.c + create mode 100644 net/6lowpan/nhc_hop.c + create mode 100644 net/6lowpan/nhc_ipv6.c + create mode 100644 net/6lowpan/nhc_mobility.c + create mode 100644 net/6lowpan/nhc_routing.c + create mode 100644 net/6lowpan/nhc_udp.c + create mode 100644 net/mpls/af_mpls.c + create mode 100644 net/mpls/internal.h + create mode 100644 net/tipc/udp_media.c + create mode 100755 samples/pktgen/pktgen.conf-1-1 + create mode 100755 samples/pktgen/pktgen.conf-1-1-flows + create mode 100755 samples/pktgen/pktgen.conf-1-1-ip6 + create mode 100755 samples/pktgen/pktgen.conf-1-1-ip6-rdos + create mode 100755 samples/pktgen/pktgen.conf-1-1-rdos + create mode 100755 samples/pktgen/pktgen.conf-1-2 + create mode 100755 samples/pktgen/pktgen.conf-2-1 + create mode 100755 samples/pktgen/pktgen.conf-2-2 +Merging ipsec-next/master (74005991b78a xfrm: Do not parse 32bits compiled xfrm netlink msg on 64bits host) +$ git merge ipsec-next/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_user.c | 5 +++++ + 1 file changed, 5 insertions(+) +Merging wireless-drivers-next/master (6029e0c59b1c Revert "bcma: Kconfig: Let it depend on PCI") +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/b43/main.c +Merge made by the 'recursive' strategy. + drivers/bcma/Kconfig | 6 +- + drivers/bcma/bcma_private.h | 20 + + drivers/bcma/driver_pci.c | 33 -- + drivers/bcma/host_pci.c | 34 ++ + drivers/net/wireless/ath/ar5523/ar5523.c | 9 +- + drivers/net/wireless/ath/ar5523/ar5523.h | 1 - + drivers/net/wireless/ath/ath5k/ath5k.h | 1 + + drivers/net/wireless/ath/ath5k/base.c | 31 +- + drivers/net/wireless/ath/ath5k/reset.c | 24 -- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 83 +++-- + drivers/net/wireless/ath/ath9k/ar9003_rtt.c | 6 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- + drivers/net/wireless/ath/ath9k/hw.c | 3 + + drivers/net/wireless/ath/ath9k/hw.h | 8 +- + drivers/net/wireless/ath/ath9k/init.c | 9 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 16 + + drivers/net/wireless/ath/wil6210/debugfs.c | 1 + + drivers/net/wireless/ath/wil6210/main.c | 1 + + drivers/net/wireless/ath/wil6210/netdev.c | 4 +- + drivers/net/wireless/ath/wil6210/txrx.c | 72 +++- + drivers/net/wireless/ath/wil6210/wil6210.h | 1 + + drivers/net/wireless/b43/main.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 3 +- + drivers/net/wireless/brcm80211/brcmfmac/chip.c | 294 ++++++++++++--- + drivers/net/wireless/brcm80211/brcmfmac/chip.h | 12 +- + drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 5 +- + drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 10 +- + drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 173 +++++---- + drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +- + .../net/wireless/brcm80211/include/brcm_hw_ids.h | 1 + + drivers/net/wireless/iwlwifi/dvm/mac80211.c | 17 +- + drivers/net/wireless/iwlwifi/dvm/rs.c | 7 +- + drivers/net/wireless/iwlwifi/dvm/tx.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-7000.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-8000.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 2 + + drivers/net/wireless/iwlwifi/iwl-drv.c | 22 +- + drivers/net/wireless/iwlwifi/iwl-drv.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 1 + + drivers/net/wireless/iwlwifi/iwl-fw-file.h | 8 +- + drivers/net/wireless/iwlwifi/iwl-io.c | 2 + + drivers/net/wireless/iwlwifi/iwl-modparams.h | 2 + + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 411 +++++++++++++++------ + drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 19 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 27 ++ + drivers/net/wireless/iwlwifi/iwl-trans.h | 15 + + drivers/net/wireless/iwlwifi/mvm/coex.c | 220 ----------- + drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 61 ++- + drivers/net/wireless/iwlwifi/mvm/d3.c | 19 +- + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 26 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h | 47 --- + drivers/net/wireless/iwlwifi/mvm/fw-api.h | 107 +++++- + drivers/net/wireless/iwlwifi/mvm/fw.c | 10 + + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 180 +++++++-- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 63 +++- + drivers/net/wireless/iwlwifi/mvm/nvm.c | 290 ++++++++++++++- + drivers/net/wireless/iwlwifi/mvm/ops.c | 11 +- + drivers/net/wireless/iwlwifi/mvm/power.c | 6 +- + drivers/net/wireless/iwlwifi/mvm/quota.c | 3 +- + drivers/net/wireless/iwlwifi/mvm/rs.c | 96 ++++- + drivers/net/wireless/iwlwifi/mvm/sf.c | 67 +++- + drivers/net/wireless/iwlwifi/mvm/sta.c | 5 +- + drivers/net/wireless/iwlwifi/mvm/time-event.c | 22 +- + drivers/net/wireless/iwlwifi/mvm/utils.c | 2 +- + drivers/net/wireless/iwlwifi/pcie/drv.c | 27 +- + drivers/net/wireless/iwlwifi/pcie/internal.h | 4 + + drivers/net/wireless/iwlwifi/pcie/trans.c | 157 +++++++- + drivers/net/wireless/iwlwifi/pcie/tx.c | 63 +++- + drivers/net/wireless/libertas_tf/if_usb.c | 2 - + drivers/net/wireless/rtlwifi/base.h | 1 - + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 5 +- + include/linux/bcma/bcma.h | 9 + + include/linux/bcma/bcma_driver_pci.h | 8 +- + include/linux/mmc/sdio_ids.h | 1 + + 74 files changed, 2093 insertions(+), 839 deletions(-) +Merging bluetooth/master (4f0f155ceaf7 Bluetooth: Add simple version of Read Local OOB Extended Data command) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + include/net/bluetooth/bluetooth.h | 4 + + include/net/bluetooth/hci.h | 11 + + include/net/bluetooth/hci_core.h | 9 +- + include/net/bluetooth/mgmt.h | 43 ++++ + net/bluetooth/hci_sock.c | 59 ++++- + net/bluetooth/mgmt.c | 469 ++++++++++++++++++++++++++++++-------- + 6 files changed, 494 insertions(+), 101 deletions(-) +Merging infiniband/for-next (147d1da951cf Merge branches 'core', 'cxgb4', 'iser', 'mlx4', 'mlx5', 'ocrdma', 'odp', 'qib' and 'srp' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (5e0899db69e2 mtd: nand: MTD_NAND_HISI504 should depend on HAS_DMA) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (7234bea69de2 mtd: clean up whitespace in linux/mtd/map.h) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/sunxi-nand.txt | 2 +- + drivers/mtd/devices/block2mtd.c | 58 +++++--- + drivers/mtd/devices/docg3.c | 5 +- + drivers/mtd/mtd_blkdevs.c | 3 - + drivers/mtd/nand/atmel_nand.c | 7 +- + drivers/mtd/nand/atmel_nand_nfc.h | 1 + + drivers/mtd/nand/denali.c | 3 - + drivers/mtd/nand/mxc_nand.c | 146 +++++++++++++-------- + drivers/mtd/nand/nand_base.c | 12 +- + drivers/mtd/nand/pxa3xx_nand.c | 24 +++- + drivers/mtd/nand/s3c2410.c | 3 - + drivers/mtd/onenand/onenand_base.c | 12 +- + drivers/mtd/tests/oobtest.c | 2 +- + drivers/mtd/tests/speedtest.c | 2 +- + drivers/mtd/tests/stresstest.c | 4 +- + drivers/mtd/tests/subpagetest.c | 4 +- + drivers/mtd/tests/torturetest.c | 8 +- + include/linux/mtd/map.h | 54 +++++--- + 18 files changed, 217 insertions(+), 133 deletions(-) +Merging crypto/master (05713ba9055f crypto: don't export static symbol) +$ git merge crypto/master +Auto-merging arch/x86/crypto/aesni-intel_glue.c +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/crypto/crypto-API-userspace.txt +Merge made by the 'recursive' strategy. + Documentation/DocBook/crypto-API.tmpl | 860 +++++++++ + Documentation/crypto/crypto-API-userspace.txt | 205 --- + .../bindings/hwrng/brcm,iproc-rng200.txt | 12 + + MAINTAINERS | 1 + + arch/arm/Kconfig | 3 + + arch/arm/crypto/Kconfig | 123 ++ + arch/arm/crypto/Makefile | 8 + + arch/arm/crypto/aes-ce-core.S | 518 ++++++ + arch/arm/crypto/aes-ce-glue.c | 520 ++++++ + arch/arm/crypto/ghash-ce-core.S | 94 + + arch/arm/crypto/ghash-ce-glue.c | 318 ++++ + arch/arm/crypto/sha1-ce-core.S | 134 ++ + arch/arm/crypto/sha1-ce-glue.c | 150 ++ + arch/arm/crypto/sha2-ce-core.S | 134 ++ + arch/arm/crypto/sha2-ce-glue.c | 203 ++ + arch/mips/cavium-octeon/crypto/Makefile | 5 +- + arch/mips/cavium-octeon/crypto/octeon-crypto.c | 4 +- + arch/mips/cavium-octeon/crypto/octeon-crypto.h | 83 +- + arch/mips/cavium-octeon/crypto/octeon-md5.c | 8 - + arch/mips/cavium-octeon/crypto/octeon-sha1.c | 241 +++ + arch/mips/cavium-octeon/crypto/octeon-sha256.c | 280 +++ + arch/mips/cavium-octeon/crypto/octeon-sha512.c | 277 +++ + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 14 - + arch/powerpc/crypto/Makefile | 8 + + arch/powerpc/crypto/aes-spe-core.S | 351 ++++ + arch/powerpc/crypto/aes-spe-glue.c | 512 ++++++ + arch/powerpc/crypto/aes-spe-keys.S | 283 +++ + arch/powerpc/crypto/aes-spe-modes.S | 630 +++++++ + arch/powerpc/crypto/aes-spe-regs.h | 42 + + arch/powerpc/crypto/aes-tab-4k.S | 331 ++++ + arch/powerpc/crypto/md5-asm.S | 243 +++ + arch/powerpc/crypto/md5-glue.c | 165 ++ + arch/powerpc/crypto/sha1-spe-asm.S | 299 +++ + arch/powerpc/crypto/sha1-spe-glue.c | 210 +++ + arch/powerpc/crypto/sha256-spe-asm.S | 323 ++++ + arch/powerpc/crypto/sha256-spe-glue.c | 275 +++ + arch/x86/crypto/aesni-intel_glue.c | 164 +- + arch/x86/crypto/glue_helper.c | 1 - + arch/x86/crypto/sha-mb/sha1_mb_mgr_init_avx2.c | 2 +- + crypto/Kconfig | 140 +- + crypto/Makefile | 1 + + crypto/algif_aead.c | 666 +++++++ + crypto/ansi_cprng.c | 6 +- + crypto/drbg.c | 64 +- + crypto/tcrypt.c | 4 +- + crypto/testmgr.c | 10 +- + drivers/char/hw_random/Kconfig | 13 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/bcm63xx-rng.c | 43 +- + drivers/char/hw_random/iproc-rng200.c | 254 +++ + drivers/char/hw_random/octeon-rng.c | 4 +- + drivers/char/hw_random/omap-rng.c | 19 +- + drivers/char/hw_random/pseries-rng.c | 4 +- + drivers/char/hw_random/xgene-rng.c | 10 + + drivers/crypto/Kconfig | 11 +- + drivers/crypto/Makefile | 1 + + drivers/crypto/amcc/crypto4xx_core.c | 6 +- + drivers/crypto/atmel-aes.c | 2 +- + drivers/crypto/atmel-sha.c | 2 +- + drivers/crypto/atmel-tdes.c | 2 +- + drivers/crypto/caam/caamhash.c | 1 + + drivers/crypto/caam/caamrng.c | 6 +- + drivers/crypto/ccp/Makefile | 9 +- + drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 12 +- + drivers/crypto/ccp/ccp-crypto-aes-xts.c | 4 +- + drivers/crypto/ccp/ccp-crypto-aes.c | 3 +- + drivers/crypto/ccp/ccp-crypto-main.c | 5 +- + drivers/crypto/ccp/ccp-crypto-sha.c | 12 +- + drivers/crypto/ccp/ccp-crypto.h | 3 - + drivers/crypto/ccp/ccp-dev.c | 7 +- + drivers/crypto/ccp/ccp-dev.h | 12 +- + drivers/crypto/ccp/ccp-ops.c | 24 +- + drivers/crypto/ccp/ccp-pci.c | 21 +- + drivers/crypto/ccp/ccp-platform.c | 111 +- + drivers/crypto/mxs-dcp.c | 2 +- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 2 +- + drivers/crypto/sahara.c | 14 +- + drivers/crypto/talitos.c | 17 +- + drivers/crypto/ux500/hash/hash_core.c | 2 +- + drivers/crypto/vmx/Kconfig | 8 + + drivers/crypto/vmx/Makefile | 19 + + drivers/crypto/vmx/aes.c | 139 ++ + drivers/crypto/vmx/aes_cbc.c | 184 ++ + drivers/crypto/vmx/aes_ctr.c | 167 ++ + drivers/crypto/vmx/aesp8-ppc.h | 20 + + drivers/crypto/vmx/aesp8-ppc.pl | 1930 ++++++++++++++++++++ + drivers/crypto/vmx/ghash.c | 214 +++ + drivers/crypto/vmx/ghashp8-ppc.pl | 228 +++ + drivers/crypto/vmx/ppc-xlate.pl | 207 +++ + drivers/crypto/vmx/vmx.c | 88 + + include/crypto/rng.h | 3 +- + 91 files changed, 12208 insertions(+), 563 deletions(-) + delete mode 100644 Documentation/crypto/crypto-API-userspace.txt + create mode 100644 Documentation/devicetree/bindings/hwrng/brcm,iproc-rng200.txt + create mode 100644 arch/arm/crypto/Kconfig + create mode 100644 arch/arm/crypto/aes-ce-core.S + create mode 100644 arch/arm/crypto/aes-ce-glue.c + create mode 100644 arch/arm/crypto/ghash-ce-core.S + create mode 100644 arch/arm/crypto/ghash-ce-glue.c + create mode 100644 arch/arm/crypto/sha1-ce-core.S + create mode 100644 arch/arm/crypto/sha1-ce-glue.c + create mode 100644 arch/arm/crypto/sha2-ce-core.S + create mode 100644 arch/arm/crypto/sha2-ce-glue.c + create mode 100644 arch/mips/cavium-octeon/crypto/octeon-sha1.c + create mode 100644 arch/mips/cavium-octeon/crypto/octeon-sha256.c + create mode 100644 arch/mips/cavium-octeon/crypto/octeon-sha512.c + create mode 100644 arch/powerpc/crypto/aes-spe-core.S + create mode 100644 arch/powerpc/crypto/aes-spe-glue.c + create mode 100644 arch/powerpc/crypto/aes-spe-keys.S + create mode 100644 arch/powerpc/crypto/aes-spe-modes.S + create mode 100644 arch/powerpc/crypto/aes-spe-regs.h + create mode 100644 arch/powerpc/crypto/aes-tab-4k.S + create mode 100644 arch/powerpc/crypto/md5-asm.S + create mode 100644 arch/powerpc/crypto/md5-glue.c + create mode 100644 arch/powerpc/crypto/sha1-spe-asm.S + create mode 100644 arch/powerpc/crypto/sha1-spe-glue.c + create mode 100644 arch/powerpc/crypto/sha256-spe-asm.S + create mode 100644 arch/powerpc/crypto/sha256-spe-glue.c + create mode 100644 crypto/algif_aead.c + create mode 100644 drivers/char/hw_random/iproc-rng200.c + create mode 100644 drivers/crypto/vmx/Kconfig + create mode 100644 drivers/crypto/vmx/Makefile + create mode 100644 drivers/crypto/vmx/aes.c + create mode 100644 drivers/crypto/vmx/aes_cbc.c + create mode 100644 drivers/crypto/vmx/aes_ctr.c + create mode 100644 drivers/crypto/vmx/aesp8-ppc.h + create mode 100644 drivers/crypto/vmx/aesp8-ppc.pl + create mode 100644 drivers/crypto/vmx/ghash.c + create mode 100644 drivers/crypto/vmx/ghashp8-ppc.pl + create mode 100644 drivers/crypto/vmx/ppc-xlate.pl + create mode 100644 drivers/crypto/vmx/vmx.c +$ git am -3 ../patches/0001-crypto-fix-for-sendmsg-recvmsg-API-change.patch +Applying: crypto: fix for sendmsg/recvmsg API change +$ git reset HEAD^ +Unstaged changes after reset: +M crypto/algif_aead.c +$ git add -A . +$ git commit -v -a --amend +[master 07daf0dfc69a] Merge remote-tracking branch 'crypto/master' + Date: Mon Mar 16 13:16:28 2015 +1100 +Merging drm/drm-next (03be70050c85 Merge tag 'topic/drm-misc-2015-03-10' of git://anongit.freedesktop.org/drm-intel into drm-next) +$ git merge drm/drm-next +Recorded preimage for 'drivers/gpu/drm/i915/intel_display.c' +Auto-merging drivers/gpu/drm/i915/intel_uncore.c +Removing drivers/gpu/drm/i915/intel_dsi_cmd.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Removing drivers/gpu/drm/i915/i915_ums.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/intel_display.c'. +[master 260ebe9f8be2] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/drm.tmpl | 16 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 294 +++++------ + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 51 ++ + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 59 +-- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c | 4 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.h | 3 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 41 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 640 +++++++++++++++-------- + drivers/gpu/drm/drm_atomic.c | 112 ++-- + drivers/gpu/drm/drm_atomic_helper.c | 209 ++++---- + drivers/gpu/drm/drm_crtc.c | 100 +++- + drivers/gpu/drm/drm_crtc_helper.c | 1 + + drivers/gpu/drm/drm_ioctl.c | 3 + + drivers/gpu/drm/drm_irq.c | 58 +- + drivers/gpu/drm/drm_modes.c | 4 +- + drivers/gpu/drm/drm_plane_helper.c | 36 +- + drivers/gpu/drm/drm_sysfs.c | 61 ++- + drivers/gpu/drm/i2c/adv7511.c | 2 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 101 ++-- + drivers/gpu/drm/i915/Makefile | 6 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 74 ++- + drivers/gpu/drm/i915/i915_debugfs.c | 137 +++-- + drivers/gpu/drm/i915/i915_dma.c | 187 +++++-- + drivers/gpu/drm/i915/i915_drv.c | 183 ++++--- + drivers/gpu/drm/i915/i915_drv.h | 187 ++----- + drivers/gpu/drm/i915/i915_gem.c | 39 +- + drivers/gpu/drm/i915/i915_gem_context.c | 12 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 97 ++-- + drivers/gpu/drm/i915/i915_gem_gtt.c | 400 ++++++++------ + drivers/gpu/drm/i915/i915_gem_gtt.h | 35 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 8 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 5 +- + drivers/gpu/drm/i915/i915_irq.c | 95 +--- + drivers/gpu/drm/i915/i915_reg.h | 110 +++- + drivers/gpu/drm/i915/i915_suspend.c | 215 +------- + drivers/gpu/drm/i915/i915_sysfs.c | 74 ++- + drivers/gpu/drm/i915/i915_trace.h | 8 +- + drivers/gpu/drm/i915/i915_ums.c | 552 ------------------- + drivers/gpu/drm/i915/i915_vgpu.c | 264 ++++++++++ + drivers/gpu/drm/i915/i915_vgpu.h | 91 ++++ + drivers/gpu/drm/i915/intel_atomic.c | 4 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 24 +- + drivers/gpu/drm/i915/intel_bios.c | 7 + + drivers/gpu/drm/i915/intel_bios.h | 1 + + drivers/gpu/drm/i915/intel_ddi.c | 46 +- + drivers/gpu/drm/i915/intel_display.c | 588 +++++++++++++-------- + drivers/gpu/drm/i915/intel_dp.c | 139 ++++- + drivers/gpu/drm/i915/intel_drv.h | 49 +- + drivers/gpu/drm/i915/intel_dsi.c | 2 +- + drivers/gpu/drm/i915/intel_dsi_cmd.h | 39 -- + drivers/gpu/drm/i915/intel_fbc.c | 93 ++-- + drivers/gpu/drm/i915/intel_fbdev.c | 3 +- + drivers/gpu/drm/i915/intel_lrc.c | 208 ++++++-- + drivers/gpu/drm/i915/intel_lrc.h | 12 +- + drivers/gpu/drm/i915/intel_lvds.c | 2 +- + drivers/gpu/drm/i915/intel_opregion.c | 6 +- + drivers/gpu/drm/i915/intel_overlay.c | 2 - + drivers/gpu/drm/i915/intel_pm.c | 233 ++++++--- + drivers/gpu/drm/i915/intel_ringbuffer.c | 304 ++++++++--- + drivers/gpu/drm/i915/intel_ringbuffer.h | 12 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 220 ++++++++ + drivers/gpu/drm/i915/intel_sprite.c | 53 +- + drivers/gpu/drm/i915/intel_uncore.c | 59 ++- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 6 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 6 +- + drivers/gpu/drm/msm/msm_atomic.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 400 +++++++------- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 8 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 17 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 16 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 71 +-- + drivers/gpu/drm/rcar-du/rcar_du_group.h | 5 + + drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 9 +- + drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 65 ++- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 333 +++++++++++- + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 9 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 18 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 8 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 419 ++++++--------- + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 69 +-- + drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 9 +- + drivers/gpu/drm/tegra/dc.c | 6 +- + drivers/gpu/drm/tegra/drm.c | 4 +- + include/drm/drmP.h | 10 + + include/drm/drm_atomic_helper.h | 6 +- + include/drm/drm_crtc.h | 8 + + include/drm/drm_crtc_helper.h | 3 +- + include/drm/drm_dp_helper.h | 171 +++++- + include/drm/drm_modes.h | 2 +- + include/drm/drm_plane_helper.h | 10 +- + include/drm/i915_pciids.h | 28 +- + include/uapi/drm/drm.h | 1 + + include/uapi/drm/drm_fourcc.h | 78 +++ + include/uapi/drm/drm_mode.h | 9 + + 94 files changed, 4891 insertions(+), 3597 deletions(-) + delete mode 100644 drivers/gpu/drm/i915/i915_ums.c + create mode 100644 drivers/gpu/drm/i915/i915_vgpu.c + create mode 100644 drivers/gpu/drm/i915/i915_vgpu.h + delete mode 100644 drivers/gpu/drm/i915/intel_dsi_cmd.h +Merging drm-panel/drm/panel/for-next (23923ebaac52 drm: Remove unused DRM_MODE_OBJECT_BRIDGE) +$ git merge drm-panel/drm/panel/for-next +Auto-merging include/drm/drm_crtc.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/bridge/Kconfig | 11 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/ps8622.c | 684 +++++++++++++++++++++++++++++++++++++++ + drivers/gpu/drm/bridge/ptn3460.c | 2 +- + include/drm/drm_crtc.h | 1 - + 5 files changed, 697 insertions(+), 2 deletions(-) + create mode 100644 drivers/gpu/drm/bridge/ps8622.c +Merging drm-intel/for-linux-next (e81918499f06 drm/i915: Fix vmap_batch page iterator overrun) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_uncore.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_cmd_parser.c | 5 +- + drivers/gpu/drm/i915/i915_debugfs.c | 213 +++++-- + drivers/gpu/drm/i915/i915_dma.c | 53 +- + drivers/gpu/drm/i915/i915_drv.c | 7 - + drivers/gpu/drm/i915/i915_drv.h | 63 +- + drivers/gpu/drm/i915/i915_gem.c | 27 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 21 +- + drivers/gpu/drm/i915/i915_irq.c | 24 +- + drivers/gpu/drm/i915/i915_params.c | 6 +- + drivers/gpu/drm/i915/i915_reg.h | 81 ++- + drivers/gpu/drm/i915/i915_sysfs.c | 4 +- + drivers/gpu/drm/i915/i915_vgpu.h | 2 +- + drivers/gpu/drm/i915/intel_atomic.c | 12 +- + drivers/gpu/drm/i915/intel_ddi.c | 39 +- + drivers/gpu/drm/i915/intel_display.c | 394 ++++++------ + drivers/gpu/drm/i915/intel_dp.c | 187 +++++- + drivers/gpu/drm/i915/intel_dp_mst.c | 4 +- + drivers/gpu/drm/i915/intel_drv.h | 16 +- + drivers/gpu/drm/i915/intel_fbc.c | 91 +-- + drivers/gpu/drm/i915/intel_fbdev.c | 27 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 18 +- + drivers/gpu/drm/i915/intel_pm.c | 990 ++++++++++++++--------------- + drivers/gpu/drm/i915/intel_ringbuffer.c | 47 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 1 - + drivers/gpu/drm/i915/intel_runtime_pm.c | 56 +- + drivers/gpu/drm/i915/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/intel_sprite.c | 4 +- + drivers/gpu/drm/i915/intel_uncore.c | 10 +- + include/drm/i915_pciids.h | 49 +- + include/uapi/drm/drm_fourcc.h | 2 +- + include/uapi/drm/i915_drm.h | 3 + + 32 files changed, 1487 insertions(+), 975 deletions(-) +Merging drm-tegra/drm/tegra/for-next (07d05cbf60ed drm/tegra: dc: Move more code into ->init()) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (43fc884efe20 drm: Silence sparse warnings) +$ git merge drm-misc/topic/drm-misc +Auto-merging include/drm/drm_crtc.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_atomic_helper.c | 34 ++++++------ + drivers/gpu/drm/drm_bridge.c | 2 +- + drivers/gpu/drm/drm_dp_helper.c | 76 ++++++++++++++++++++------- + drivers/gpu/drm/drm_drv.c | 2 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 2 +- + drivers/gpu/drm/drm_fb_helper.c | 48 ++++++++++++----- + drivers/gpu/drm/drm_info.c | 1 + + drivers/gpu/drm/drm_ioc32.c | 2 +- + drivers/gpu/drm/drm_pci.c | 1 + + drivers/gpu/drm/drm_plane_helper.c | 11 ++-- + drivers/gpu/drm/drm_vm.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 5 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +- + include/drm/drm_crtc.h | 2 +- + include/drm/drm_dp_helper.h | 5 ++ + include/drm/drm_fb_helper.h | 19 +++++++ + 16 files changed, 152 insertions(+), 61 deletions(-) +Merging drm-exynos/exynos-drm/for-next (917d67900576 drm/exynos: fix typo config name correctly.) +$ git merge drm-exynos/exynos-drm/for-next +Removing drivers/gpu/drm/exynos/exynos_drm_connector.h +Removing drivers/gpu/drm/exynos/exynos_drm_connector.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/exynos/Kconfig | 2 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_connector.c | 245 -------------------------- + drivers/gpu/drm/exynos/exynos_drm_connector.h | 20 --- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- + 5 files changed, 4 insertions(+), 269 deletions(-) + delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_connector.c + delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_connector.h +Merging sound/for-next (e79d74ab2533 ALSA: control: Fix breakage of user ctl element addition) +$ git merge sound/for-next +Removing sound/soc/davinci/davinci-pcm.h +Removing sound/soc/davinci/davinci-pcm.c +Removing sound/pci/hda/hda_priv.h +Auto-merging sound/core/pcm_native.c +Merge made by the 'recursive' strategy. + .../bindings/sound/nvidia,tegra-audio-max98090.txt | 1 + + Documentation/sound/alsa/timestamping.txt | 200 +++++ + include/sound/compress_driver.h | 4 +- + include/sound/control.h | 2 +- + include/sound/pcm.h | 66 +- + include/sound/pcm_params.h | 7 + + include/sound/seq_device.h | 46 +- + include/sound/seq_kernel.h | 6 +- + include/sound/soc.h | 18 +- + include/uapi/sound/asequencer.h | 1 + + include/uapi/sound/asound.h | 39 +- + include/uapi/sound/compress_offload.h | 2 +- + include/uapi/sound/emu10k1.h | 3 +- + include/uapi/sound/hdspm.h | 6 + + sound/core/control.c | 271 ++++--- + sound/core/device.c | 4 +- + sound/core/hwdep.c | 4 +- + sound/core/oss/mixer_oss.c | 4 +- + sound/core/oss/pcm_oss.c | 1 - + sound/core/pcm.c | 105 ++- + sound/core/pcm_compat.c | 28 +- + sound/core/pcm_dmaengine.c | 4 +- + sound/core/pcm_lib.c | 88 ++- + sound/core/pcm_native.c | 41 +- + sound/core/rawmidi.c | 8 +- + sound/core/seq/oss/seq_oss.c | 22 +- + sound/core/seq/oss/seq_oss_init.c | 4 +- + sound/core/seq/oss/seq_oss_midi.c | 5 +- + sound/core/seq/oss/seq_oss_readq.c | 9 +- + sound/core/seq/oss/seq_oss_synth.c | 12 +- + sound/core/seq/oss/seq_oss_synth.h | 4 +- + sound/core/seq/seq_device.c | 571 ++++---------- + sound/core/seq/seq_dummy.c | 6 +- + sound/core/seq/seq_fifo.c | 4 +- + sound/core/seq/seq_memory.c | 8 +- + sound/core/seq/seq_midi.c | 36 +- + sound/core/seq/seq_ports.c | 4 +- + sound/core/seq/seq_prioq.c | 4 +- + sound/core/seq/seq_queue.c | 4 +- + sound/core/seq/seq_timer.c | 4 +- + sound/core/sound.c | 14 +- + sound/core/timer.c | 4 +- + sound/drivers/opl3/opl3_seq.c | 34 +- + sound/drivers/opl4/opl4_seq.c | 33 +- + sound/firewire/amdtp.c | 8 +- + sound/firewire/fireworks/fireworks_transaction.c | 2 +- + sound/isa/sb/emu8000_synth.c | 35 +- + sound/oss/opl3.c | 4 +- + sound/oss/sb_ess.c | 19 +- + sound/oss/sb_midi.c | 6 +- + sound/oss/sys_timer.c | 35 +- + sound/pci/ac97/ac97_codec.c | 1 + + sound/pci/ac97/ac97_patch.c | 27 + + sound/pci/azt3328.c | 7 +- + sound/pci/cmipci.c | 2 +- + sound/pci/emu10k1/emu10k1_synth.c | 35 +- + sound/pci/hda/hda_codec.c | 87 +-- + sound/pci/hda/hda_codec.h | 22 +- + sound/pci/hda/hda_controller.c | 136 ++-- + sound/pci/hda/hda_controller.h | 397 +++++++++- + sound/pci/hda/hda_i915.c | 2 +- + sound/pci/hda/hda_intel.c | 23 +- + sound/pci/hda/hda_intel.h | 2 +- + sound/pci/hda/hda_local.h | 17 - + sound/pci/hda/hda_priv.h | 406 ---------- + sound/pci/hda/hda_tegra.c | 9 +- + sound/pci/rme9652/hdspm.c | 141 +--- + sound/soc/atmel/atmel_ssc_dai.c | 111 ++- + sound/soc/atmel/atmel_ssc_dai.h | 1 + + sound/soc/codecs/Kconfig | 18 +- + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/adau1977.c | 17 +- + sound/soc/codecs/cs35l32.c | 19 +- + sound/soc/codecs/cs4265.c | 19 +- + sound/soc/codecs/max98357a.c | 11 +- + sound/soc/codecs/pcm512x.c | 178 ++++- + sound/soc/codecs/rt286.c | 17 +- + sound/soc/codecs/rt5670.h | 3 + + sound/soc/codecs/rt5677.c | 44 +- + sound/soc/codecs/rt5677.h | 6 + + sound/soc/codecs/sn95031.c | 14 +- + sound/soc/codecs/sn95031.h | 3 +- + sound/soc/codecs/sta350.c | 30 +- + sound/soc/codecs/tas2552.c | 13 +- + sound/soc/codecs/wm8804-i2c.c | 64 ++ + sound/soc/codecs/wm8804-spi.c | 56 ++ + sound/soc/codecs/wm8804.c | 281 ++----- + sound/soc/codecs/wm8804.h | 7 + + sound/soc/codecs/wm_adsp.c | 13 +- + sound/soc/davinci/Kconfig | 18 +- + sound/soc/davinci/Makefile | 2 - + sound/soc/davinci/davinci-i2s.c | 67 +- + sound/soc/davinci/davinci-mcasp.c | 99 +-- + sound/soc/davinci/davinci-pcm.c | 861 --------------------- + sound/soc/davinci/davinci-pcm.h | 41 - + sound/soc/davinci/davinci-vcif.c | 55 +- + sound/soc/fsl/fsl-asoc-card.c | 6 + + sound/soc/fsl/imx-es8328.c | 6 +- + sound/soc/fsl/wm1133-ev1.c | 12 +- + sound/soc/generic/simple-card.c | 20 +- + sound/soc/intel/broadwell.c | 16 +- + sound/soc/intel/byt-max98090.c | 11 +- + sound/soc/intel/bytcr_dpcm_rt5640.c | 4 +- + sound/soc/intel/cht_bsw_rt5645.c | 16 +- + sound/soc/intel/cht_bsw_rt5672.c | 9 +- + sound/soc/intel/haswell.c | 4 +- + sound/soc/intel/mfld_machine.c | 24 +- + sound/soc/intel/sst-mfld-platform-pcm.c | 60 ++ + sound/soc/intel/sst-mfld-platform.h | 1 + + sound/soc/intel/sst/sst.c | 128 ++- + sound/soc/intel/sst/sst.h | 12 + + sound/soc/intel/sst/sst_drv_interface.c | 65 +- + sound/soc/intel/sst/sst_loader.c | 10 +- + sound/soc/omap/Kconfig | 4 +- + sound/soc/omap/ams-delta.c | 4 +- + sound/soc/omap/omap-abe-twl6040.c | 10 +- + sound/soc/omap/omap-pcm.c | 21 +- + sound/soc/omap/omap-twl4030.c | 12 +- + sound/soc/omap/rx51.c | 6 +- + sound/soc/pxa/hx4700.c | 11 +- + sound/soc/pxa/palm27x.c | 11 +- + sound/soc/pxa/ttc-dkb.c | 15 +- + sound/soc/pxa/z2.c | 10 +- + sound/soc/samsung/h1940_uda1380.c | 9 +- + sound/soc/samsung/littlemill.c | 12 +- + sound/soc/samsung/lowland.c | 14 +- + sound/soc/samsung/rx1950_uda1380.c | 9 +- + sound/soc/samsung/smartq_wm8987.c | 11 +- + sound/soc/samsung/speyside.c | 14 +- + sound/soc/samsung/tobermory.c | 13 +- + sound/soc/soc-core.c | 16 +- + sound/soc/soc-jack.c | 42 +- + sound/soc/soc-pcm.c | 1 + + sound/soc/tegra/tegra_alc5632.c | 9 +- + sound/soc/tegra/tegra_max98090.c | 26 +- + sound/soc/tegra/tegra_rt5640.c | 10 +- + sound/soc/tegra/tegra_rt5677.c | 14 +- + sound/soc/tegra/tegra_wm8903.c | 18 +- + sound/usb/quirks.c | 40 +- + 139 files changed, 2727 insertions(+), 3275 deletions(-) + create mode 100644 Documentation/sound/alsa/timestamping.txt + delete mode 100644 sound/pci/hda/hda_priv.h + create mode 100644 sound/soc/codecs/wm8804-i2c.c + create mode 100644 sound/soc/codecs/wm8804-spi.c + delete mode 100644 sound/soc/davinci/davinci-pcm.c + delete mode 100644 sound/soc/davinci/davinci-pcm.h +Merging sound-asoc/for-next (a62354bfc44e Merge remote-tracking branches 'asoc/topic/wm2200', 'asoc/topic/wm5100', 'asoc/topic/wm8804' and 'asoc/topic/wm8996' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/sound/ingenic,jz4740-i2s.txt | 2 +- + .../devicetree/bindings/sound/max98925.txt | 22 + + .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 49 ++ + .../devicetree/bindings/sound/renesas,rsnd.txt | 125 +++- + Documentation/devicetree/bindings/sound/wm8804.txt | 3 + + MAINTAINERS | 7 + + drivers/dma/of-dma.c | 1 + + drivers/regulator/devres.c | 85 +++ + include/linux/regulator/consumer.h | 16 + + include/sound/rt5670.h | 1 + + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ab8500-codec.c | 2 - + sound/soc/codecs/adav80x.c | 4 +- + sound/soc/codecs/ak4641.c | 4 +- + sound/soc/codecs/ak4671.c | 44 +- + sound/soc/codecs/arizona.c | 6 +- + sound/soc/codecs/cs4271.c | 4 +- + sound/soc/codecs/cx20442.c | 4 +- + sound/soc/codecs/da732x.c | 8 +- + sound/soc/codecs/es8328.c | 4 +- + sound/soc/codecs/max98925.c | 655 ++++++++++++++++ + sound/soc/codecs/max98925.h | 832 +++++++++++++++++++++ + sound/soc/codecs/pcm1681.c | 4 +- + sound/soc/codecs/rt286.c | 4 +- + sound/soc/codecs/rt5645.c | 44 +- + sound/soc/codecs/rt5645.h | 2 - + sound/soc/codecs/rt5670.c | 213 +++++- + sound/soc/codecs/rt5670.h | 7 + + sound/soc/codecs/sgtl5000.c | 8 +- + sound/soc/codecs/sn95031.c | 4 +- + sound/soc/codecs/tas5086.c | 4 +- + sound/soc/codecs/tlv320aic23-i2c.c | 4 +- + sound/soc/codecs/wm2000.c | 8 +- + sound/soc/codecs/wm2200.c | 8 +- + sound/soc/codecs/wm5100.c | 7 +- + sound/soc/codecs/wm8731.c | 4 +- + sound/soc/codecs/wm8804.c | 28 +- + sound/soc/codecs/wm8903.c | 4 +- + sound/soc/codecs/wm8904.c | 4 +- + sound/soc/codecs/wm8955.c | 4 +- + sound/soc/codecs/wm8960.c | 4 +- + sound/soc/codecs/wm8996.c | 12 +- + sound/soc/codecs/wm9712.c | 6 +- + sound/soc/codecs/wm9713.c | 6 +- + sound/soc/davinci/davinci-mcasp.c | 27 +- + sound/soc/fsl/fsl_ssi.c | 4 +- + sound/soc/intel/broadwell.c | 28 + + sound/soc/intel/cht_bsw_rt5672.c | 40 +- + sound/soc/intel/sst-dsp-priv.h | 13 + + sound/soc/intel/sst-firmware.c | 1 + + sound/soc/intel/sst-haswell-dsp.c | 6 +- + sound/soc/intel/sst-haswell-ipc.c | 456 ++++++++++- + sound/soc/intel/sst-haswell-ipc.h | 53 ++ + sound/soc/intel/sst-haswell-pcm.c | 139 +++- + sound/soc/jz4740/jz4740-i2s.c | 84 ++- + sound/soc/omap/Kconfig | 2 +- + sound/soc/qcom/lpass-cpu.c | 510 +++++++++++++ + sound/soc/qcom/lpass-lpaif-ipq806x.h | 172 +++++ + sound/soc/qcom/lpass-platform.c | 526 +++++++++++++ + sound/soc/qcom/lpass.h | 51 ++ + sound/soc/sh/rcar/Makefile | 2 +- + sound/soc/sh/rcar/core.c | 235 +----- + sound/soc/sh/rcar/dma.c | 620 +++++++++++++++ + sound/soc/sh/rcar/dvc.c | 12 + + sound/soc/sh/rcar/gen.c | 146 +--- + sound/soc/sh/rcar/rsnd.h | 72 +- + sound/soc/sh/rcar/src.c | 23 +- + sound/soc/sh/rcar/ssi.c | 28 +- + sound/soc/soc-core.c | 42 +- + sound/soc/tegra/tegra_rt5677.c | 1 - + 71 files changed, 4952 insertions(+), 614 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/max98925.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt + create mode 100644 sound/soc/codecs/max98925.c + create mode 100644 sound/soc/codecs/max98925.h + create mode 100644 sound/soc/qcom/lpass-cpu.c + create mode 100644 sound/soc/qcom/lpass-lpaif-ipq806x.h + create mode 100644 sound/soc/qcom/lpass-platform.c + create mode 100644 sound/soc/qcom/lpass.h + create mode 100644 sound/soc/sh/rcar/dma.c +Merging modules/modules-next (6587457b4b3d Merge tag 'dma-buf-for-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (cf02b2c2d1a1 virtio_mmio: generation support) +$ git merge virtio/virtio-next +Merge made by the 'recursive' strategy. + drivers/char/virtio_console.c | 19 ++++++++++++++++++- + drivers/rpmsg/virtio_rpmsg_bus.c | 17 ++++++++++++++++- + drivers/virtio/virtio_balloon.c | 21 ++++++++++++++++----- + drivers/virtio/virtio_mmio.c | 11 +++++++++++ + include/uapi/linux/virtio_blk.h | 8 ++++++-- + net/9p/trans_virtio.c | 25 +++++++++++++++++++++---- + 6 files changed, 88 insertions(+), 13 deletions(-) +Merging input/next (f13b2065de81 Input: i8042 - allow KBD and AUX ports to wake up from suspend-to-idle) +$ git merge input/next +Auto-merging include/uapi/linux/input.h +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/mouse/psmouse-base.c +Auto-merging drivers/hid/hid-debug.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/brcm,bcm-keypad.txt | 108 +++++ + .../bindings/input/touchscreen/goodix.txt | 29 ++ + .../bindings/input/touchscreen/sun4i.txt | 3 +- + .../bindings/input/touchscreen/sx8654.txt | 16 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/hid/hid-debug.c | 2 +- + drivers/input/keyboard/Kconfig | 21 + + drivers/input/keyboard/Makefile | 2 + + drivers/input/keyboard/bcm-keypad.c | 458 +++++++++++++++++++++ + drivers/input/keyboard/ipaq-micro-keys.c | 168 ++++++++ + drivers/input/misc/Kconfig | 12 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/max77843-haptic.c | 358 ++++++++++++++++ + drivers/input/misc/pwm-beeper.c | 8 +- + drivers/input/mouse/elan_i2c_core.c | 15 +- + drivers/input/mouse/elan_i2c_i2c.c | 10 +- + drivers/input/mouse/psmouse-base.c | 40 +- + drivers/input/mouse/synaptics.c | 35 +- + drivers/input/mouse/synaptics.h | 1 + + drivers/input/serio/i8042.c | 28 +- + drivers/input/touchscreen/Kconfig | 16 +- + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/goodix.c | 36 +- + drivers/input/touchscreen/sun4i-ts.c | 16 +- + drivers/input/touchscreen/sx8654.c | 286 +++++++++++++ + drivers/platform/x86/fujitsu-tablet.c | 6 +- + drivers/platform/x86/hp-wmi.c | 2 +- + include/uapi/linux/input.h | 3 +- + 28 files changed, 1618 insertions(+), 64 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/brcm,bcm-keypad.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/goodix.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/sx8654.txt + create mode 100644 drivers/input/keyboard/bcm-keypad.c + create mode 100644 drivers/input/keyboard/ipaq-micro-keys.c + create mode 100644 drivers/input/misc/max77843-haptic.c + create mode 100644 drivers/input/touchscreen/sx8654.c +Merging block/for-next (bfd343aa1718 blk-mq: don't wait in blk_mq_queue_enter() if __GFP_WAIT isn't set) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + block/blk-mq-sysfs.c | 1 + + block/blk-mq.c | 47 ++++++++++++++++++++++++++++++----------------- + drivers/block/nbd.c | 8 ++++---- + include/linux/blk-mq.h | 3 +++ + mm/page-writeback.c | 2 +- + 5 files changed, 39 insertions(+), 22 deletions(-) +Merging device-mapper/for-next (026a558f2ba5 dm: add 'use_blk_mq' module param and expose in per-device ro sysfs attr) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-block-dm | 14 + + Documentation/device-mapper/switch.txt | 4 +- + block/blk-core.c | 5 +- + drivers/md/Kconfig | 11 + + drivers/md/dm-cache-policy-mq.c | 251 ++++++++++---- + drivers/md/dm-io.c | 15 +- + drivers/md/dm-log-userspace-base.c | 84 ++--- + drivers/md/dm-mpath.c | 6 +- + drivers/md/dm-snap.c | 120 ++++++- + drivers/md/dm-sysfs.c | 43 ++- + drivers/md/dm-table.c | 31 +- + drivers/md/dm-thin.c | 11 - + drivers/md/dm.c | 576 +++++++++++++++++++++++-------- + drivers/md/dm.h | 10 +- + include/linux/blkdev.h | 2 - + include/linux/device-mapper.h | 6 +- + include/uapi/linux/dm-ioctl.h | 4 +- + 17 files changed, 883 insertions(+), 310 deletions(-) +Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) +$ git merge mmc/mmc-next +Already up-to-date. +Merging mmc-uh/next (fb0ed6021cbc mmc: sunxi: add MMC_CAP_SDIO_IRQ capability) +$ git merge mmc-uh/next +Removing include/linux/mmc/sdhci.h +Removing include/linux/mmc/sdhci-spear.h +Auto-merging drivers/mmc/host/sh_mmcif.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 23 ++ + .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 7 + + drivers/mmc/core/pwrseq.c | 16 +- + drivers/mmc/core/pwrseq.h | 6 +- + drivers/mmc/core/pwrseq_emmc.c | 11 +- + drivers/mmc/core/pwrseq_simple.c | 13 +- + drivers/mmc/host/Kconfig | 21 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/dw_mmc-exynos.c | 185 +++++++++++++--- + drivers/mmc/host/dw_mmc-exynos.h | 19 +- + drivers/mmc/host/dw_mmc-rockchip.c | 8 + + drivers/mmc/host/dw_mmc.c | 142 ++++++++++-- + drivers/mmc/host/dw_mmc.h | 2 + + drivers/mmc/host/omap_hsmmc.c | 92 ++++---- + drivers/mmc/host/sdhci-acpi.c | 1 - + drivers/mmc/host/sdhci-bcm-kona.c | 61 ++---- + drivers/mmc/host/sdhci-bcm2835.c | 7 +- + drivers/mmc/host/sdhci-cns3xxx.c | 7 +- + drivers/mmc/host/sdhci-dove.c | 39 +--- + drivers/mmc/host/sdhci-esdhc-imx.c | 7 +- + drivers/mmc/host/sdhci-iproc.c | 241 +++++++++++++++++++++ + drivers/mmc/host/sdhci-of-arasan.c | 1 - + drivers/mmc/host/sdhci-of-esdhc.c | 7 +- + drivers/mmc/host/sdhci-of-hlwd.c | 7 +- + drivers/mmc/host/sdhci-pltfm.c | 56 ++--- + drivers/mmc/host/sdhci-sirf.c | 42 +--- + drivers/mmc/host/sdhci-spear.c | 47 +--- + drivers/mmc/host/sdhci-st.c | 12 +- + drivers/mmc/host/sdhci-tegra.c | 77 +++---- + drivers/mmc/host/sdhci.c | 27 +-- + drivers/mmc/host/sdhci.h | 203 ++++++++++++++++- + drivers/mmc/host/sh_mmcif.c | 17 +- + drivers/mmc/host/sunxi-mmc.c | 11 +- + drivers/mmc/host/tmio_mmc_pio.c | 2 - + include/linux/mmc/sdhci-spear.h | 34 --- + include/linux/mmc/sdhci.h | 218 ------------------- + 36 files changed, 996 insertions(+), 674 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt + create mode 100644 drivers/mmc/host/sdhci-iproc.c + delete mode 100644 include/linux/mmc/sdhci-spear.h + delete mode 100644 include/linux/mmc/sdhci.h +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 (4400755e356f md/raid5: allow the stripe_cache to grow and shrink.) +$ git merge md/for-next +Auto-merging drivers/md/Kconfig +Merge made by the 'recursive' strategy. + Documentation/md-cluster.txt | 176 ++++++++ + crypto/async_tx/async_pq.c | 19 +- + drivers/md/Kconfig | 16 + + drivers/md/Makefile | 1 + + drivers/md/bitmap.c | 189 ++++++++- + drivers/md/bitmap.h | 10 +- + drivers/md/md-cluster.c | 889 +++++++++++++++++++++++++++++++++++++++++ + drivers/md/md-cluster.h | 27 ++ + drivers/md/md.c | 274 +++++++++++-- + drivers/md/md.h | 24 +- + drivers/md/raid0.c | 48 ++- + drivers/md/raid1.c | 29 +- + drivers/md/raid10.c | 8 +- + drivers/md/raid5.c | 811 +++++++++++++++++++++++++++++++------ + drivers/md/raid5.h | 59 ++- + include/linux/async_tx.h | 3 + + include/linux/raid/pq.h | 1 + + include/uapi/linux/raid/md_p.h | 7 + + include/uapi/linux/raid/md_u.h | 1 + + lib/raid6/algos.c | 41 +- + lib/raid6/altivec.uc | 1 + + lib/raid6/avx2.c | 3 + + lib/raid6/int.uc | 41 +- + lib/raid6/mmx.c | 2 + + lib/raid6/neon.c | 1 + + lib/raid6/sse1.c | 2 + + lib/raid6/sse2.c | 227 +++++++++++ + lib/raid6/test/test.c | 51 ++- + lib/raid6/tilegx.uc | 1 + + 29 files changed, 2702 insertions(+), 260 deletions(-) + create mode 100644 Documentation/md-cluster.txt + create mode 100644 drivers/md/md-cluster.c + create mode 100644 drivers/md/md-cluster.h +Merging mfd/for-mfd-next (f2c23396d6e7 mfd: mc13xxx-core: %pF is only for function pointers) +$ git merge mfd/for-mfd-next +Auto-merging sound/soc/codecs/arizona.c +Auto-merging include/dt-bindings/mfd/arizona.h +Removing drivers/mfd/rtsx_gops.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + + Documentation/devicetree/bindings/mfd/arizona.txt | 41 +- + Documentation/devicetree/bindings/mfd/da9150.txt | 43 + + Documentation/devicetree/bindings/mfd/mt6397.txt | 70 ++ + Documentation/devicetree/bindings/mfd/sky81452.txt | 35 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + .../video/backlight/sky81452-backlight.txt | 29 + + drivers/extcon/extcon-arizona.c | 1 + + drivers/gpio/gpio-arizona.c | 1 + + drivers/mfd/Kconfig | 55 +- + drivers/mfd/Makefile | 6 +- + drivers/mfd/ab8500-debugfs.c | 196 ++-- + drivers/mfd/arizona-core.c | 25 +- + drivers/mfd/arizona-i2c.c | 2 + + drivers/mfd/arizona-irq.c | 1 + + drivers/mfd/arizona-spi.c | 2 + + drivers/mfd/axp20x.c | 8 +- + drivers/mfd/da9052-irq.c | 2 + + drivers/mfd/da9052-spi.c | 6 +- + drivers/mfd/da9150-core.c | 2 +- + drivers/mfd/intel_quark_i2c_gpio.c | 277 +++++ + drivers/mfd/intel_soc_pmic_core.c | 14 +- + drivers/mfd/kempld-core.c | 11 +- + drivers/mfd/max77693.c | 4 +- + drivers/mfd/max77843.c | 243 +++++ + drivers/mfd/mc13xxx-core.c | 6 +- + drivers/mfd/menelaus.c | 4 +- + drivers/mfd/mt6397-core.c | 227 ++++ + drivers/mfd/rk808.c | 1 + + drivers/mfd/rtl8411.c | 11 +- + drivers/mfd/rts5209.c | 4 +- + drivers/mfd/rts5227.c | 12 +- + drivers/mfd/rts5229.c | 4 +- + drivers/mfd/rts5249.c | 343 +++++- + drivers/mfd/rtsx_gops.c | 37 - + drivers/mfd/rtsx_pcr.c | 109 +- + drivers/mfd/rtsx_pcr.h | 8 + + drivers/mfd/sec-core.c | 5 +- + drivers/mfd/sky81452.c | 108 ++ + drivers/mfd/ti_am335x_tscadc.c | 13 +- + drivers/mfd/vexpress-sysreg.c | 71 +- + drivers/regulator/arizona-micsupp.c | 1 + + drivers/rtc/rtc-s5m.c | 60 -- + drivers/video/backlight/Kconfig | 10 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/sky81452-backlight.c | 353 +++++++ + .../arizona/gpio.h => dt-bindings/mfd/arizona.h} | 67 +- + include/linux/mfd/arizona/core.h | 1 + + include/linux/mfd/arizona/pdata.h | 22 +- + include/linux/mfd/max77693-private.h | 5 +- + include/linux/mfd/max77693.h | 13 - + include/linux/mfd/max77843-private.h | 454 ++++++++ + include/linux/mfd/mt6397/core.h | 64 ++ + include/linux/mfd/mt6397/registers.h | 362 +++++++ + include/linux/mfd/rk808.h | 3 + + include/linux/mfd/rtsx_pci.h | 1116 ++++++++++---------- + include/linux/mfd/samsung/core.h | 9 - + include/linux/mfd/sky81452.h | 31 + + include/linux/mfd/ti_am335x_tscadc.h | 1 + + include/linux/platform_data/sky81452-backlight.h | 46 + + sound/soc/codecs/arizona.c | 3 +- + 61 files changed, 3653 insertions(+), 1008 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/da9150.txt + create mode 100644 Documentation/devicetree/bindings/mfd/mt6397.txt + create mode 100644 Documentation/devicetree/bindings/mfd/sky81452.txt + create mode 100644 Documentation/devicetree/bindings/video/backlight/sky81452-backlight.txt + create mode 100644 drivers/mfd/intel_quark_i2c_gpio.c + create mode 100644 drivers/mfd/max77843.c + create mode 100644 drivers/mfd/mt6397-core.c + delete mode 100644 drivers/mfd/rtsx_gops.c + create mode 100644 drivers/mfd/sky81452.c + create mode 100644 drivers/video/backlight/sky81452-backlight.c + rename include/{linux/mfd/arizona/gpio.h => dt-bindings/mfd/arizona.h} (54%) + create mode 100644 include/linux/mfd/max77843-private.h + create mode 100644 include/linux/mfd/mt6397/core.h + create mode 100644 include/linux/mfd/mt6397/registers.h + create mode 100644 include/linux/mfd/sky81452.h + create mode 100644 include/linux/platform_data/sky81452-backlight.h +Merging backlight/for-backlight-next (1926469377bb backlight: da9052_bl: Terminate da9052_wled_ids array with empty element) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/88pm860x_bl.c | 5 +---- + drivers/video/backlight/da9052_bl.c | 1 + + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging battery/master (0595439a0a87 power: generic-adc-battery: Fix power_supply_property returned value) +$ git merge battery/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iio/adc/da9150-gpadc.txt | 16 + + .../devicetree/bindings/power/da9150-charger.txt | 26 + + MAINTAINERS | 4 + + drivers/iio/adc/Kconfig | 9 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/da9150-gpadc.c | 407 +++++++ + drivers/power/Kconfig | 21 + + drivers/power/Makefile | 4 +- + drivers/power/ab8500_fg.c | 83 +- + drivers/power/axp288_fuel_gauge.c | 1151 ++++++++++++++++++++ + drivers/power/bq2415x_charger.c | 40 +- + drivers/power/bq27x00_battery.c | 55 +- + drivers/power/da9150-charger.c | 688 ++++++++++++ + drivers/power/generic-adc-battery.c | 2 +- + drivers/power/ipaq_micro_battery.c | 22 +- + drivers/power/lp8788-charger.c | 4 +- + drivers/power/ltc2941-battery-gauge.c | 2 +- + drivers/power/max14577_charger.c | 114 +- + drivers/power/max17040_battery.c | 9 +- + drivers/power/max17042_battery.c | 10 +- + drivers/power/max77693_charger.c | 99 +- + drivers/power/power_supply_core.c | 45 + + drivers/power/rt5033_battery.c | 2 +- + drivers/power/smb347-charger.c | 3 +- + drivers/power/twl4030_madc_battery.c | 7 +- + include/linux/power_supply.h | 4 + + 26 files changed, 2657 insertions(+), 171 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt + create mode 100644 Documentation/devicetree/bindings/power/da9150-charger.txt + create mode 100644 drivers/iio/adc/da9150-gpadc.c + create mode 100644 drivers/power/axp288_fuel_gauge.c + create mode 100644 drivers/power/da9150-charger.c +Merging omap_dss2/for-next (72fc8b7187cd Merge branches '4.1/fbdev' and '4.1/omapdss' into for-next) +$ git merge omap_dss2/for-next +Auto-merging include/video/omapdss.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/video/ti,omap-dss.txt | 4 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 2 +- + drivers/video/fbdev/hyperv_fb.c | 6 +- + drivers/video/fbdev/imxfb.c | 2 +- + .../video/fbdev/omap2/displays-new/connector-dvi.c | 2 +- + .../fbdev/omap2/displays-new/encoder-tfp410.c | 11 ++ + .../omap2/displays-new/panel-lgphilips-lb035q02.c | 2 +- + .../omap2/displays-new/panel-sharp-ls037v7dw01.c | 2 +- + .../omap2/displays-new/panel-sony-acx565akm.c | 2 +- + .../omap2/displays-new/panel-tpo-td028ttec1.c | 2 +- + .../omap2/displays-new/panel-tpo-td043mtea1.c | 2 +- + drivers/video/fbdev/omap2/dss/dispc.c | 147 +++++++++++++++++++-- + drivers/video/fbdev/omap2/dss/display.c | 2 +- + drivers/video/fbdev/omap2/dss/dsi.c | 2 +- + drivers/video/fbdev/omap2/dss/dss.c | 3 + + drivers/video/fbdev/omap2/dss/dss_features.c | 2 +- + drivers/video/fbdev/omap2/dss/hdmi4.c | 50 +++++++ + drivers/video/fbdev/omap2/dss/hdmi5.c | 50 +++++++ + drivers/video/fbdev/omap2/dss/hdmi5_core.c | 2 +- + drivers/video/fbdev/omap2/dss/rfbi.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 4 +- + drivers/video/fbdev/pm3fb.c | 6 +- + drivers/video/fbdev/pxafb.c | 6 +- + drivers/video/fbdev/sm501fb.c | 2 +- + drivers/video/fbdev/via/via_clock.c | 2 +- + include/video/omapdss.h | 7 +- + 26 files changed, 281 insertions(+), 43 deletions(-) +Merging regulator/for-next (0609baa58e3a Merge remote-tracking branches 'regulator/topic/dbx500', 'regulator/topic/load-op', 'regulator/topic/mode', 'regulator/topic/notifier' and 'regulator/topic/wm8350' into regulator-next) +$ git merge regulator/for-next +Auto-merging drivers/regulator/arizona-micsupp.c +Merge made by the 'recursive' strategy. + .../bindings/regulator/act8865-regulator.txt | 27 +++- + Documentation/power/regulator/consumer.txt | 2 +- + drivers/gpu/drm/msm/edp/edp_ctrl.c | 6 +- + drivers/phy/phy-qcom-ufs.c | 4 +- + drivers/regulator/act8865-regulator.c | 161 ++++++++++++++++++--- + drivers/regulator/arizona-ldo1.c | 5 +- + drivers/regulator/arizona-micsupp.c | 5 +- + drivers/regulator/core.c | 81 ++++++----- + drivers/regulator/da9211-regulator.c | 8 +- + drivers/regulator/dbx500-prcmu.c | 32 ++-- + drivers/regulator/qcom_rpm-regulator.c | 30 ++++ + drivers/regulator/wm8350-regulator.c | 5 +- + drivers/scsi/ufs/ufshcd.c | 27 +--- + drivers/usb/phy/phy-ab8500-usb.c | 4 +- + drivers/usb/phy/phy-msm-usb.c | 15 +- + include/linux/regulator/act8865.h | 14 ++ + include/linux/regulator/consumer.h | 7 +- + include/linux/regulator/driver.h | 3 + + 18 files changed, 301 insertions(+), 135 deletions(-) +Merging security/next (74f0414b2f9a Merge tag 'yama-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next) +$ git merge security/next +Merge made by the 'recursive' strategy. + security/yama/Kconfig | 2 -- + security/yama/yama_lsm.c | 13 +++++-------- + 2 files changed, 5 insertions(+), 10 deletions(-) +Merging integrity/next (7bea7ff67e0c ima: /proc/keys is now mandatory) +$ git merge integrity/next +Merge made by the 'recursive' strategy. +Merging selinux/next (1cad16744b21 selinux: remove unnecessary pointer reassignment in avc_has_perm_noaudit()) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/avc.c | 6 ++---- + security/selinux/ss/mls.c | 10 +++------- + security/selinux/ss/services.c | 6 +----- + 3 files changed, 6 insertions(+), 16 deletions(-) +Merging lblnet/next (b2776bf7149b Linux 3.18) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (c517d838eb7d Linux 4.0-rc1) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (eccd732182ce Merge branches 'iommu/fixes', 'x86/vt-d' and 'x86/amd' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/iommu/amd_iommu_v2.c | 2 +- + drivers/iommu/intel-iommu.c | 13 +++++++------ + drivers/iommu/intel_irq_remapping.c | 12 ++++++------ + 3 files changed, 14 insertions(+), 13 deletions(-) +Merging dwmw2-iommu/master (1860e379875d Linux 3.15) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (6140a8f56238 vfio-pci: Add device request interface) +$ 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 (b0e1ee8e1405 MSI-HOWTO.txt: remove reference on IRQF_DISABLED) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/CodingStyle | 149 ++++++++++++++++---------------- + Documentation/PCI/MSI-HOWTO.txt | 15 +--- + Documentation/arm/Booting | 9 +- + Documentation/arm/README | 15 +++- + Documentation/input/alps.txt | 4 +- + Documentation/input/event-codes.txt | 2 +- + Documentation/input/gpio-tilt.txt | 2 +- + Documentation/input/iforce-protocol.txt | 2 +- + Documentation/input/walkera0701.txt | 2 +- + Documentation/input/yealink.txt | 2 +- + Documentation/memory-hotplug.txt | 45 +++++++--- + Documentation/printk-formats.txt | 9 ++ + Documentation/vm/transhuge.txt | 11 +++ + include/linux/hsi/hsi.h | 6 +- + 14 files changed, 162 insertions(+), 111 deletions(-) +Merging trivial/for-next (0e4f93e5017d goldfish: goldfish_tty_probe() is not using 'i' any more) +$ git merge trivial/for-next +Auto-merging tools/perf/util/probe-finder.c +Auto-merging sound/soc/soc-core.c +Auto-merging net/sunrpc/xprtrdma/verbs.c +Auto-merging init/main.c +Auto-merging include/linux/stacktrace.h +Auto-merging drivers/tty/ipwireless/hardware.c +Auto-merging drivers/tty/goldfish.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/scsi/ch.c +Auto-merging drivers/pinctrl/nomadik/pinctrl-abx500.c +Auto-merging drivers/net/wireless/rtlwifi/rtl8821ae/dm.c +Auto-merging drivers/net/wireless/rtlwifi/rtl8723be/dm.c +Auto-merging drivers/net/wireless/ath/wcn36xx/smd.c +Auto-merging drivers/net/wireless/ath/ath10k/mac.c +Auto-merging drivers/net/wireless/airo.c +Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +Auto-merging drivers/mtd/nand/gpmi-nand/gpmi-lib.c +Auto-merging drivers/mmc/core/sd.c +Auto-merging drivers/mmc/core/mmc.c +Auto-merging drivers/media/dvb-frontends/si2168_priv.h +Auto-merging drivers/media/dvb-frontends/m88ds3103.c +Auto-merging arch/powerpc/perf/hv-24x7.c +Auto-merging arch/powerpc/kernel/prom.c +Merge made by the 'recursive' strategy. + arch/arc/kernel/unwind.c | 2 +- + arch/powerpc/include/asm/smu.h | 2 +- + arch/powerpc/kernel/prom.c | 2 +- + arch/powerpc/perf/hv-24x7.c | 2 +- + arch/powerpc/platforms/85xx/p1022_rdk.c | 4 ++-- + arch/x86/kernel/test_rodata.c | 2 +- + drivers/iio/adc/max1027.c | 2 +- + drivers/isdn/hardware/mISDN/mISDNinfineon.c | 2 +- + drivers/isdn/mISDN/dsp_cmx.c | 2 +- + drivers/isdn/mISDN/dsp_core.c | 4 ++-- + drivers/media/dvb-frontends/m88ds3103.c | 2 +- + drivers/media/dvb-frontends/si2168_priv.h | 2 +- + drivers/media/dvb-frontends/tda10071_priv.h | 2 +- + drivers/media/tuners/msi001.c | 2 +- + drivers/mfd/si476x-i2c.c | 2 +- + drivers/mmc/core/mmc.c | 4 ++-- + drivers/mmc/core/sd.c | 4 ++-- + drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 +- + drivers/net/phy/dp83640.c | 2 +- + drivers/net/wireless/airo.c | 4 ++-- + drivers/net/wireless/ath/ath10k/mac.c | 2 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8723be/dm.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8821ae/dm.c | 2 +- + drivers/parisc/eisa_enumerator.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 2 +- + drivers/scsi/be2iscsi/be_cmds.c | 2 +- + drivers/scsi/ch.c | 2 +- + drivers/scsi/osd/osd_initiator.c | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 4 ++-- + drivers/scsi/qla2xxx/qla_mid.c | 2 +- + drivers/scsi/qla2xxx/qla_nx.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 8 ++++---- + drivers/tty/goldfish.c | 2 -- + drivers/tty/ipwireless/hardware.c | 2 +- + drivers/usb/storage/isd200.c | 2 +- + fs/jffs2/xattr.c | 2 +- + include/linux/smpboot.h | 1 - + include/linux/stacktrace.h | 2 -- + init/main.c | 2 +- + lib/div64.c | 2 +- + net/atm/mpoa_proc.c | 2 +- + net/sunrpc/xprtrdma/verbs.c | 4 ++-- + sound/soc/soc-core.c | 4 ++-- + tools/perf/util/probe-finder.c | 2 +- + 47 files changed, 55 insertions(+), 60 deletions(-) +Merging audit/next (724e7bfcc566 audit: Remove condition which always evaluates to false) +$ git merge audit/next +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit_tree.c +Auto-merging kernel/audit.h +Auto-merging kernel/audit.c +Merge made by the 'recursive' strategy. + kernel/audit.c | 47 +++++++++++++++++----------- + kernel/audit.h | 3 ++ + kernel/audit_tree.c | 88 ++++++++++++++++++++++++++++++++++++----------------- + kernel/auditsc.c | 9 +----- + 4 files changed, 94 insertions(+), 53 deletions(-) +Merging devicetree/devicetree/next (fca8ba4ee24d of/unittest: Remove obsolete code) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (a697c2efba03 of/platform: Fix sparc:allmodconfig build) +$ git merge dt-rh/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (33350e6b1833 Mailbox: Restructure and simplify PCC mailbox code) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + drivers/mailbox/pcc.c | 122 +++++++++++++++----------------------------------- + 1 file changed, 37 insertions(+), 85 deletions(-) +Merging spi/for-next (ac5b718e03d4 Merge remote-tracking branches 'spi/topic/rockchip', 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic/spidev' and 'spi/topic/spidev-test' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/spi/spi-sh-msiof.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/fsl-imx-cspi.txt | 12 +- + .../devicetree/bindings/spi/qcom,spi-qup.txt | 8 + + Documentation/spi/spi-summary | 3 +- + Documentation/spi/spidev_test.c | 115 +++++-- + drivers/spi/Kconfig | 5 +- + drivers/spi/spi-bcm53xx.c | 4 +- + drivers/spi/spi-dw-mid.c | 167 ++++++---- + drivers/spi/spi-dw.c | 288 +++++------------ + drivers/spi/spi-dw.h | 60 ++-- + drivers/spi/spi-img-spfi.c | 1 - + drivers/spi/spi-imx.c | 4 +- + drivers/spi/spi-pl022.c | 14 +- + drivers/spi/spi-qup.c | 345 ++++++++++++++++++--- + drivers/spi/spi-rockchip.c | 15 +- + drivers/spi/spi-s3c64xx.c | 4 +- + drivers/spi/spi-sc18is602.c | 2 +- + drivers/spi/spi-sh-msiof.c | 24 +- + drivers/spi/spi.c | 117 +------ + drivers/spi/spidev.c | 28 +- + include/linux/spi/spi.h | 8 +- + 20 files changed, 708 insertions(+), 516 deletions(-) +Merging tip/auto-latest (ba518c0a33ad Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Resolved 'drivers/usb/isp1760/isp1760-core.c' using previous resolution. +Auto-merging tools/perf/util/probe-finder.c +Auto-merging drivers/usb/isp1760/isp1760-core.c +CONFLICT (content): Merge conflict in drivers/usb/isp1760/isp1760-core.c +Removing arch/x86/ia32/syscall_ia32.c +Removing arch/x86/ia32/nosyscall.c +Auto-merging arch/x86/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 160a83ab7fe4] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/acpi/apei/einj.txt | 196 +-- + Documentation/scsi/ncr53c8xx.txt | 25 - + Documentation/scsi/tmscsim.txt | 4 - + arch/mips/loongson/loongson-3/hpet.c | 2 +- + arch/powerpc/perf/core-book3s.c | 13 +- + arch/x86/Kconfig | 35 +- + arch/x86/boot/compressed/head_32.S | 3 +- + arch/x86/boot/compressed/head_64.S | 3 +- + arch/x86/boot/video-mode.c | 4 +- + arch/x86/boot/video.c | 2 + + arch/x86/boot/video.h | 1 - + arch/x86/configs/i386_defconfig | 2 +- + arch/x86/configs/x86_64_defconfig | 2 +- + arch/x86/ia32/Makefile | 1 - + arch/x86/ia32/ia32entry.S | 345 ++--- + arch/x86/ia32/nosyscall.c | 7 - + arch/x86/ia32/sys_ia32.c | 14 - + arch/x86/ia32/syscall_ia32.c | 25 - + arch/x86/include/asm/alternative-asm.h | 43 +- + arch/x86/include/asm/alternative.h | 65 +- + arch/x86/include/asm/apic.h | 2 +- + arch/x86/include/asm/barrier.h | 6 +- + arch/x86/include/asm/calling.h | 267 ++-- + arch/x86/include/asm/cpufeature.h | 40 +- + arch/x86/include/asm/desc.h | 7 +- + arch/x86/include/asm/dwarf2.h | 24 + + arch/x86/include/asm/fpu-internal.h | 82 +- + arch/x86/include/asm/insn.h | 2 +- + arch/x86/include/asm/irqflags.h | 4 +- + arch/x86/include/asm/mce.h | 8 +- + arch/x86/include/asm/microcode.h | 73 ++ + arch/x86/include/asm/microcode_intel.h | 13 +- + arch/x86/include/asm/processor.h | 55 +- + arch/x86/include/asm/ptrace.h | 13 +- + arch/x86/include/asm/smap.h | 30 +- + arch/x86/include/asm/special_insns.h | 10 + + arch/x86/include/asm/thread_info.h | 5 +- + arch/x86/include/uapi/asm/ptrace-abi.h | 16 +- + arch/x86/include/uapi/asm/ptrace.h | 13 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/alternative.c | 158 ++- + arch/x86/kernel/apic/x2apic_cluster.c | 8 +- + arch/x86/kernel/asm-offsets_64.c | 1 + + arch/x86/kernel/cpu/amd.c | 5 + + arch/x86/kernel/cpu/common.c | 58 +- + arch/x86/kernel/cpu/mcheck/mce-internal.h | 9 +- + arch/x86/kernel/cpu/mcheck/mce.c | 90 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 11 +- + arch/x86/kernel/cpu/mcheck/mce_intel.c | 63 +- + arch/x86/kernel/cpu/microcode/core_early.c | 75 +- + arch/x86/kernel/cpu/microcode/intel.c | 4 +- + arch/x86/kernel/cpu/microcode/intel_early.c | 345 +++-- + arch/x86/kernel/cpu/microcode/intel_lib.c | 22 +- + arch/x86/kernel/cpu/mkcapflags.sh | 2 +- + arch/x86/kernel/cpu/perf_event.c | 71 +- + arch/x86/kernel/cpu/perf_event.h | 20 +- + arch/x86/kernel/cpu/perf_event_amd_ibs.c | 12 +- + arch/x86/kernel/cpu/perf_event_intel.c | 36 +- + arch/x86/kernel/cpu/perf_event_intel_cqm.c | 1380 ++++++++++++++++++++ + arch/x86/kernel/cpu/perf_event_intel_lbr.c | 307 ++++- + .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 3 +- + arch/x86/kernel/devicetree.c | 4 +- + arch/x86/kernel/dumpstack.c | 11 +- + arch/x86/kernel/dumpstack_32.c | 9 +- + arch/x86/kernel/dumpstack_64.c | 11 +- + arch/x86/kernel/e820.c | 2 +- + arch/x86/kernel/entry_32.S | 33 +- + arch/x86/kernel/entry_64.S | 519 ++++---- + arch/x86/kernel/head_32.S | 3 +- + arch/x86/kernel/head_64.S | 6 +- + arch/x86/kernel/i387.c | 24 +- + arch/x86/kernel/ioport.c | 2 +- + arch/x86/kernel/irq.c | 4 +- + arch/x86/kernel/process.c | 32 +- + arch/x86/kernel/process_32.c | 19 +- + arch/x86/kernel/process_64.c | 10 +- + arch/x86/kernel/ptrace.c | 10 +- + arch/x86/kernel/relocate_kernel_32.S | 8 +- + arch/x86/kernel/relocate_kernel_64.S | 8 +- + arch/x86/kernel/setup.c | 8 +- + arch/x86/kernel/smpboot.c | 2 + + arch/x86/kernel/syscall_32.c | 16 +- + arch/x86/kernel/traps.c | 31 +- + arch/x86/kernel/vm86_32.c | 4 +- + arch/x86/kernel/xsave.c | 13 +- + arch/x86/lguest/boot.c | 1 + + arch/x86/lib/atomic64_cx8_32.S | 50 +- + arch/x86/lib/checksum_32.S | 64 +- + arch/x86/lib/clear_page_64.S | 66 +- + arch/x86/lib/copy_page_64.S | 37 +- + arch/x86/lib/copy_user_64.S | 46 +- + arch/x86/lib/csum-copy_64.S | 2 +- + arch/x86/lib/insn.c | 13 + + arch/x86/lib/memcpy_64.S | 68 +- + arch/x86/lib/memmove_64.S | 19 +- + arch/x86/lib/memset_64.S | 61 +- + arch/x86/lib/msr-reg.S | 24 +- + arch/x86/lib/rwsem.S | 44 +- + arch/x86/lib/thunk_32.S | 18 +- + arch/x86/lib/thunk_64.S | 28 +- + arch/x86/lib/x86-opcode-map.txt | 9 + + arch/x86/mm/init.c | 69 +- + arch/x86/mm/init_64.c | 14 - + arch/x86/mm/pageattr.c | 4 - + arch/x86/mm/pat.c | 6 +- + arch/x86/mm/pgtable.c | 81 +- + arch/x86/platform/efi/efi-bgrt.c | 4 +- + arch/x86/platform/uv/tlb_uv.c | 6 +- + arch/x86/power/cpu.c | 2 +- + arch/x86/syscalls/syscall_32.tbl | 4 +- + arch/x86/um/asm/barrier.h | 4 +- + arch/x86/vdso/vdso32/sigreturn.S | 1 + + arch/x86/xen/enlighten.c | 1 + + drivers/block/cpqarray.c | 4 +- + drivers/bus/omap_l3_noc.c | 4 +- + drivers/bus/omap_l3_smx.c | 10 +- + drivers/clocksource/time-efm32.c | 4 +- + drivers/clocksource/timer-sun5i.c | 8 +- + drivers/mtd/nand/hisi504_nand.c | 3 +- + include/linux/clockchips.h | 21 +- + include/linux/hardirq.h | 2 +- + include/linux/init.h | 38 +- + include/linux/interrupt.h | 4 +- + include/linux/irqflags.h | 43 +- + include/linux/perf_event.h | 68 +- + include/linux/seqlock.h | 6 +- + include/uapi/linux/perf_event.h | 50 +- + kernel/events/core.c | 252 ++-- + kernel/futex.c | 2 +- + kernel/irq/manage.c | 36 +- + kernel/locking/mcs_spinlock.h | 6 +- + kernel/locking/mutex.c | 57 +- + kernel/locking/osq_lock.c | 14 +- + kernel/locking/rwsem-spinlock.c | 7 + + kernel/locking/rwsem-xadd.c | 98 +- + kernel/locking/rwsem.c | 22 +- + kernel/locking/rwsem.h | 20 + + kernel/sched/core.c | 17 + + kernel/sched/fair.c | 43 +- + kernel/time/clockevents.c | 88 +- + kernel/time/timer_list.c | 32 +- + lib/lockref.c | 2 +- + tools/build/Build.include | 81 ++ + tools/build/Documentation/Build.txt | 139 ++ + tools/build/Makefile.build | 130 ++ + tools/build/tests/ex/Build | 8 + + tools/build/tests/ex/Makefile | 23 + + tools/build/tests/ex/a.c | 5 + + tools/build/tests/ex/arch/Build | 2 + + tools/build/tests/ex/arch/e.c | 5 + + tools/build/tests/ex/arch/f.c | 5 + + tools/build/tests/ex/b.c | 5 + + tools/build/tests/ex/c.c | 5 + + tools/build/tests/ex/d.c | 5 + + tools/build/tests/ex/empty/Build | 0 + tools/build/tests/ex/ex.c | 19 + + tools/build/tests/run.sh | 42 + + tools/lib/api/Build | 2 + + tools/lib/api/Makefile | 58 +- + tools/lib/api/fd/Build | 1 + + tools/lib/api/fs/Build | 4 + + tools/lib/api/fs/debugfs.c | 69 +- + tools/lib/api/fs/debugfs.h | 13 +- + tools/lib/api/fs/findfs.c | 63 + + tools/lib/api/fs/findfs.h | 23 + + tools/lib/api/fs/tracefs.c | 78 ++ + tools/lib/api/fs/tracefs.h | 21 + + tools/lib/lockdep/Build | 1 + + tools/lib/lockdep/Makefile | 132 +- + tools/lib/traceevent/Build | 17 + + tools/lib/traceevent/Makefile | 169 +-- + tools/lib/traceevent/event-parse.h | 2 + + tools/lib/traceevent/trace-seq.c | 13 +- + tools/perf/.gitignore | 1 + + tools/perf/Build | 44 + + tools/perf/Documentation/Build.txt | 49 + + tools/perf/Documentation/perf-buildid-cache.txt | 24 +- + tools/perf/Documentation/perf-data.txt | 40 + + tools/perf/Documentation/perf-diff.txt | 5 + + tools/perf/Documentation/perf-list.txt | 6 + + tools/perf/Documentation/perf-probe.txt | 16 +- + tools/perf/Documentation/perf-record.txt | 23 +- + tools/perf/Documentation/perf-trace.txt | 6 + + tools/perf/Documentation/perf.txt | 7 +- + tools/perf/MANIFEST | 1 + + tools/perf/Makefile | 2 +- + tools/perf/Makefile.perf | 620 ++------- + tools/perf/arch/Build | 2 + + tools/perf/arch/arm/Build | 2 + + tools/perf/arch/arm/Makefile | 11 - + tools/perf/arch/arm/tests/Build | 2 + + tools/perf/arch/arm/util/Build | 4 + + tools/perf/arch/arm64/Build | 1 + + tools/perf/arch/arm64/Makefile | 4 - + tools/perf/arch/arm64/util/Build | 2 + + tools/perf/arch/powerpc/Build | 1 + + tools/perf/arch/powerpc/Makefile | 3 - + tools/perf/arch/powerpc/util/Build | 4 + + tools/perf/arch/s390/Build | 1 + + tools/perf/arch/s390/Makefile | 3 - + tools/perf/arch/s390/util/Build | 4 + + tools/perf/arch/sh/Build | 1 + + tools/perf/arch/sh/Makefile | 1 - + tools/perf/arch/sh/util/Build | 1 + + tools/perf/arch/sparc/Build | 1 + + tools/perf/arch/sparc/Makefile | 1 - + tools/perf/arch/sparc/util/Build | 1 + + tools/perf/arch/x86/Build | 2 + + tools/perf/arch/x86/Makefile | 15 - + tools/perf/arch/x86/tests/Build | 2 + + tools/perf/arch/x86/util/Build | 8 + + tools/perf/bench/Build | 11 + + tools/perf/bench/mem-memcpy-x86-64-asm-def.h | 6 +- + tools/perf/bench/mem-memcpy-x86-64-asm.S | 2 - + tools/perf/bench/mem-memcpy.c | 128 +- + tools/perf/bench/mem-memset-x86-64-asm-def.h | 6 +- + tools/perf/bench/mem-memset-x86-64-asm.S | 2 - + tools/perf/builtin-buildid-cache.c | 107 +- + tools/perf/builtin-data.c | 119 ++ + tools/perf/builtin-list.c | 28 +- + tools/perf/builtin-record.c | 8 +- + tools/perf/builtin-report.c | 4 +- + tools/perf/builtin-sched.c | 32 +- + tools/perf/builtin-stat.c | 5 +- + tools/perf/builtin-top.c | 4 +- + tools/perf/builtin-trace.c | 250 +++- + tools/perf/builtin.h | 1 + + tools/perf/command-list.txt | 1 + + tools/perf/config/Makefile | 81 +- + tools/perf/config/Makefile.arch | 27 +- + tools/perf/config/feature-checks/Makefile | 22 +- + tools/perf/config/feature-checks/test-all.c | 5 + + .../config/feature-checks/test-libbabeltrace.c | 8 + + .../test-pthread-attr-setaffinity-np.c | 4 +- + tools/perf/config/utilities.mak | 3 +- + tools/perf/perf-completion.sh | 6 +- + tools/perf/perf.c | 29 + + tools/perf/perf.h | 1 + + tools/perf/scripts/Build | 2 + + tools/perf/scripts/perl/Perf-Trace-Util/Build | 3 + + tools/perf/scripts/python/Perf-Trace-Util/Build | 3 + + tools/perf/tests/Build | 42 + + tools/perf/tests/dso-data.c | 22 +- + tools/perf/tests/open-syscall-all-cpus.c | 7 +- + tools/perf/tests/open-syscall.c | 7 +- + tools/perf/tests/parse-events.c | 13 +- + tools/perf/ui/Build | 14 + + tools/perf/ui/browsers/Build | 10 + + tools/perf/ui/browsers/hists.c | 6 +- + tools/perf/ui/gtk/Build | 9 + + tools/perf/ui/tui/Build | 4 + + tools/perf/util/Build | 144 ++ + tools/perf/util/annotate.c | 2 + + tools/perf/util/build-id.c | 204 ++- + tools/perf/util/build-id.h | 8 +- + tools/perf/util/cache.h | 1 + + tools/perf/util/callchain.c | 8 + + tools/perf/util/callchain.h | 1 + + tools/perf/util/data-convert-bt.c | 614 +++++++++ + tools/perf/util/data-convert-bt.h | 8 + + tools/perf/util/debug.c | 2 + + tools/perf/util/debug.h | 1 + + tools/perf/util/dso.c | 8 +- + tools/perf/util/dwarf-aux.c | 15 + + tools/perf/util/dwarf-aux.h | 3 + + tools/perf/util/event.c | 36 +- + tools/perf/util/evlist.c | 35 +- + tools/perf/util/evlist.h | 3 + + tools/perf/util/evsel.c | 27 +- + tools/perf/util/evsel.h | 4 + + tools/perf/util/hist.c | 2 + + tools/perf/util/hist.h | 2 +- + tools/perf/util/include/asm/alternative-asm.h | 1 + + tools/perf/util/machine.c | 146 ++- + tools/perf/util/machine.h | 1 - + tools/perf/util/ordered-events.c | 5 +- + tools/perf/util/parse-events.c | 234 ++-- + tools/perf/util/parse-events.h | 13 +- + tools/perf/util/parse-options.c | 11 +- + tools/perf/util/probe-event.c | 164 ++- + tools/perf/util/probe-finder.c | 17 +- + tools/perf/util/python-ext-sources | 1 - + tools/perf/util/scripting-engines/Build | 6 + + tools/perf/util/session.c | 185 ++- + tools/perf/util/session.h | 1 - + tools/perf/util/setup.py | 2 +- + tools/perf/util/sort.c | 9 + + tools/perf/util/symbol-elf.c | 11 +- + tools/perf/util/thread.c | 14 + + tools/perf/util/thread.h | 13 + + tools/perf/util/trace-event-parse.c | 12 +- + tools/perf/util/trace-event.h | 3 + + tools/perf/util/util.c | 67 +- + tools/perf/util/util.h | 2 + + 294 files changed, 8038 insertions(+), 3750 deletions(-) + delete mode 100644 arch/x86/ia32/nosyscall.c + delete mode 100644 arch/x86/ia32/syscall_ia32.c + create mode 100644 arch/x86/kernel/cpu/perf_event_intel_cqm.c + create mode 100644 kernel/locking/rwsem.h + create mode 100644 tools/build/Build.include + create mode 100644 tools/build/Documentation/Build.txt + create mode 100644 tools/build/Makefile.build + create mode 100644 tools/build/tests/ex/Build + create mode 100644 tools/build/tests/ex/Makefile + create mode 100644 tools/build/tests/ex/a.c + create mode 100644 tools/build/tests/ex/arch/Build + create mode 100644 tools/build/tests/ex/arch/e.c + create mode 100644 tools/build/tests/ex/arch/f.c + create mode 100644 tools/build/tests/ex/b.c + create mode 100644 tools/build/tests/ex/c.c + create mode 100644 tools/build/tests/ex/d.c + create mode 100644 tools/build/tests/ex/empty/Build + create mode 100644 tools/build/tests/ex/ex.c + create mode 100755 tools/build/tests/run.sh + create mode 100644 tools/lib/api/Build + create mode 100644 tools/lib/api/fd/Build + create mode 100644 tools/lib/api/fs/Build + create mode 100644 tools/lib/api/fs/findfs.c + create mode 100644 tools/lib/api/fs/findfs.h + create mode 100644 tools/lib/api/fs/tracefs.c + create mode 100644 tools/lib/api/fs/tracefs.h + create mode 100644 tools/lib/lockdep/Build + create mode 100644 tools/lib/traceevent/Build + create mode 100644 tools/perf/Build + create mode 100644 tools/perf/Documentation/Build.txt + create mode 100644 tools/perf/Documentation/perf-data.txt + create mode 100644 tools/perf/arch/Build + create mode 100644 tools/perf/arch/arm/Build + create mode 100644 tools/perf/arch/arm/tests/Build + create mode 100644 tools/perf/arch/arm/util/Build + create mode 100644 tools/perf/arch/arm64/Build + create mode 100644 tools/perf/arch/arm64/util/Build + create mode 100644 tools/perf/arch/powerpc/Build + create mode 100644 tools/perf/arch/powerpc/util/Build + create mode 100644 tools/perf/arch/s390/Build + create mode 100644 tools/perf/arch/s390/util/Build + create mode 100644 tools/perf/arch/sh/Build + create mode 100644 tools/perf/arch/sh/util/Build + create mode 100644 tools/perf/arch/sparc/Build + create mode 100644 tools/perf/arch/sparc/util/Build + create mode 100644 tools/perf/arch/x86/Build + create mode 100644 tools/perf/arch/x86/tests/Build + create mode 100644 tools/perf/arch/x86/util/Build + create mode 100644 tools/perf/bench/Build + create mode 100644 tools/perf/builtin-data.c + create mode 100644 tools/perf/config/feature-checks/test-libbabeltrace.c + create mode 100644 tools/perf/scripts/Build + create mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/Build + create mode 100644 tools/perf/scripts/python/Perf-Trace-Util/Build + create mode 100644 tools/perf/tests/Build + create mode 100644 tools/perf/ui/Build + create mode 100644 tools/perf/ui/browsers/Build + create mode 100644 tools/perf/ui/gtk/Build + create mode 100644 tools/perf/ui/tui/Build + create mode 100644 tools/perf/util/Build + create mode 100644 tools/perf/util/data-convert-bt.c + create mode 100644 tools/perf/util/data-convert-bt.h + create mode 100644 tools/perf/util/scripting-engines/Build +Merging clockevents/clockevents/next (4c8305221193 clocksource: Driver for Conexant Digicolor SoC timer) +$ git merge clockevents/clockevents/next +Resolved 'arch/arm/mach-rockchip/Kconfig' using previous resolution. +Resolved 'drivers/clocksource/Kconfig' using previous resolution. +Resolved 'drivers/clocksource/rockchip_timer.c' using previous resolution. +Auto-merging drivers/clocksource/rockchip_timer.c +CONFLICT (add/add): Merge conflict in drivers/clocksource/rockchip_timer.c +Auto-merging drivers/clocksource/Kconfig +CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig +Auto-merging arch/arm/mach-rockchip/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-rockchip/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 80044d00a931] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +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 (18b44b2b950a EDAC, i82443bxgx: Don't export static symbol) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/amd64_edac.c | 80 ++++++------------- + drivers/edac/amd64_edac.h | 24 +----- + drivers/edac/amd64_edac_dbg.c | 43 +++-------- + drivers/edac/amd64_edac_inj.c | 51 ++++++------ + drivers/edac/edac_core.h | 4 +- + drivers/edac/edac_mc.c | 12 +-- + drivers/edac/edac_mc_sysfs.c | 167 ++++++++++++++++++---------------------- + drivers/edac/edac_module.c | 13 ++-- + drivers/edac/edac_module.h | 3 +- + drivers/edac/highbank_mc_edac.c | 12 ++- + drivers/edac/i7core_edac.c | 34 ++++---- + drivers/edac/i82443bxgx_edac.c | 8 +- + drivers/edac/i82860_edac.c | 9 +-- + drivers/edac/i82875p_edac.c | 4 +- + drivers/edac/i82975x_edac.c | 4 +- + drivers/edac/mpc85xx_edac.c | 38 ++------- + drivers/edac/octeon_edac-lmc.c | 55 ++++--------- + 17 files changed, 203 insertions(+), 358 deletions(-) +Merging irqchip/irqchip/for-next (0dee4f8ec6bb Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Recorded preimage for 'arch/arm/mach-exynos/suspend.c' +Recorded preimage for 'arch/arm/mach-tegra/irq.c' +Removing include/linux/irqchip/irq-crossbar.h +Auto-merging arch/arm/mach-tegra/irq.c +CONFLICT (content): Merge conflict in arch/arm/mach-tegra/irq.c +Auto-merging arch/arm/mach-imx/Kconfig +Auto-merging arch/arm/mach-exynos/suspend.c +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/suspend.c +Auto-merging arch/arm/boot/dts/omap5.dtsi +Auto-merging arch/arm/boot/dts/omap4.dtsi +Auto-merging arch/arm/boot/dts/exynos5420.dtsi +Auto-merging arch/arm/boot/dts/exynos5250.dtsi +Auto-merging arch/arm/boot/dts/exynos4.dtsi +Auto-merging arch/arm/boot/dts/exynos3250.dtsi +Auto-merging arch/arm/boot/dts/dra72-evm.dts +Auto-merging arch/arm/boot/dts/dra7.dtsi +Auto-merging arch/arm/boot/dts/dra7-evm.dts +Auto-merging arch/arm/boot/dts/am57xx-beagle-x15.dts +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-exynos/suspend.c'. +Recorded resolution for 'arch/arm/mach-tegra/irq.c'. +[master 06a0d442771d] Merge remote-tracking branch 'irqchip/irqchip/for-next' +$ git diff -M --stat --summary HEAD^.. + .../arm/freescale/fsl,vf610-mscm-cpucfg.txt | 14 + + .../bindings/arm/freescale/fsl,vf610-mscm-ir.txt | 33 ++ + Documentation/devicetree/bindings/arm/gic.txt | 6 - + .../devicetree/bindings/arm/omap/crossbar.txt | 18 +- + .../devicetree/bindings/arm/samsung/pmu.txt | 17 + + .../interrupt-controller/nvidia,tegra-ictlr.txt | 43 +++ + .../interrupt-controller/st,sti-irq-syscfg.txt | 35 ++ + .../interrupt-controller/ti,omap4-wugen-mpu | 33 ++ + arch/arm/boot/dts/am4372.dtsi | 11 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 1 - + arch/arm/boot/dts/am437x-sk-evm.dts | 1 - + arch/arm/boot/dts/am43x-epos-evm.dts | 1 - + arch/arm/boot/dts/am57xx-beagle-x15.dts | 3 +- + arch/arm/boot/dts/dra7-evm.dts | 2 +- + arch/arm/boot/dts/dra7.dtsi | 43 ++- + arch/arm/boot/dts/dra72-evm.dts | 1 - + arch/arm/boot/dts/dra72x.dtsi | 3 +- + arch/arm/boot/dts/dra74x.dtsi | 5 +- + arch/arm/boot/dts/exynos3250.dtsi | 6 +- + arch/arm/boot/dts/exynos4.dtsi | 4 + + arch/arm/boot/dts/exynos5250.dtsi | 4 + + arch/arm/boot/dts/exynos5420.dtsi | 4 + + arch/arm/boot/dts/omap4-duovero.dtsi | 2 - + arch/arm/boot/dts/omap4-panda-common.dtsi | 8 +- + arch/arm/boot/dts/omap4-sdp.dts | 8 +- + arch/arm/boot/dts/omap4-var-som-om44.dtsi | 2 - + arch/arm/boot/dts/omap4.dtsi | 18 +- + arch/arm/boot/dts/omap5-cm-t54.dts | 1 - + arch/arm/boot/dts/omap5-uevm.dts | 2 - + arch/arm/boot/dts/omap5.dtsi | 26 +- + arch/arm/boot/dts/tegra114.dtsi | 16 +- + arch/arm/boot/dts/tegra124.dtsi | 16 +- + arch/arm/boot/dts/tegra20.dtsi | 15 +- + arch/arm/boot/dts/tegra30.dtsi | 16 +- + arch/arm/mach-exynos/exynos.c | 15 +- + arch/arm/mach-exynos/suspend.c | 139 +++++++- + arch/arm/mach-imx/Kconfig | 1 + + arch/arm/mach-omap2/omap-wakeupgen.c | 128 +++++-- + arch/arm/mach-omap2/omap-wakeupgen.h | 1 - + arch/arm/mach-omap2/omap4-common.c | 27 +- + arch/arm/mach-shmobile/intc-sh73a0.c | 7 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 7 +- + arch/arm/mach-tegra/iomap.h | 15 - + arch/arm/mach-tegra/irq.c | 209 +----------- + arch/arm/mach-tegra/irq.h | 6 - + arch/arm/mach-tegra/tegra.c | 1 - + arch/arm/mach-ux500/cpu.c | 2 +- + arch/arm/mach-zynq/common.c | 2 +- + drivers/irqchip/Kconfig | 7 + + drivers/irqchip/Makefile | 3 + + drivers/irqchip/irq-armada-370-xp.c | 88 +++-- + drivers/irqchip/irq-crossbar.c | 210 +++++++----- + drivers/irqchip/irq-gic.c | 60 +--- + drivers/irqchip/irq-renesas-irqc.c | 4 +- + drivers/irqchip/irq-st.c | 206 ++++++++++++ + drivers/irqchip/irq-tegra.c | 371 +++++++++++++++++++++ + drivers/irqchip/irq-vf610-mscm-ir.c | 212 ++++++++++++ + include/dt-bindings/interrupt-controller/irq-st.h | 30 ++ + include/linux/irq.h | 1 + + include/linux/irqchip/arm-gic.h | 7 +- + include/linux/irqchip/irq-crossbar.h | 11 - + kernel/irq/chip.c | 16 + + 62 files changed, 1629 insertions(+), 575 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,vf610-mscm-cpucfg.txt + create mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,vf610-mscm-ir.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/nvidia,tegra-ictlr.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/st,sti-irq-syscfg.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,omap4-wugen-mpu + create mode 100644 drivers/irqchip/irq-st.c + create mode 100644 drivers/irqchip/irq-tegra.c + create mode 100644 drivers/irqchip/irq-vf610-mscm-ir.c + create mode 100644 include/dt-bindings/interrupt-controller/irq-st.h + delete mode 100644 include/linux/irqchip/irq-crossbar.h +Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge tiny/tiny/next +Already up-to-date. +Merging ftrace/for-next (c19565fc83e6 Merge branch 'for-next/ftrace/core' into trace/for-next) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging fs/Makefile +Merge made by the 'recursive' strategy. + fs/Makefile | 1 + + fs/tracefs/Makefile | 4 + + fs/tracefs/inode.c | 644 +++++++++++++++++++++++++++++++++++ + include/linux/tracefs.h | 45 +++ + include/uapi/linux/magic.h | 2 + + kernel/trace/ftrace.c | 22 +- + kernel/trace/trace.c | 187 +++++----- + kernel/trace/trace.h | 2 +- + kernel/trace/trace_events.c | 32 +- + kernel/trace/trace_functions_graph.c | 7 +- + kernel/trace/trace_kprobe.c | 10 +- + kernel/trace/trace_probe.h | 2 +- + kernel/trace/trace_stat.c | 10 +- + 13 files changed, 826 insertions(+), 142 deletions(-) + create mode 100644 fs/tracefs/Makefile + create mode 100644 fs/tracefs/inode.c + create mode 100644 include/linux/tracefs.h +Merging rcu/rcu/next (12c056600523 rcu: Associate quiescent-state reports with grace period) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/idle.c +Auto-merging init/Kconfig +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/atomic_ops.txt | 45 +- + Documentation/kernel-parameters.txt | 32 +- + Documentation/kernel-per-CPU-kthreads.txt | 34 +- + Documentation/memory-barriers.txt | 42 +- + Documentation/timers/NO_HZ.txt | 10 +- + arch/blackfin/mach-common/smp.c | 6 +- + arch/metag/kernel/smp.c | 5 +- + arch/x86/include/asm/cpu.h | 2 - + arch/x86/include/asm/smp.h | 2 +- + arch/x86/kernel/smpboot.c | 39 +- + arch/x86/xen/smp.c | 46 +- + include/linux/cpu.h | 14 + + include/linux/lockdep.h | 7 +- + include/linux/rculist.h | 6 +- + include/linux/rcupdate.h | 60 +- + include/linux/rcutree.h | 2 - + include/linux/srcu.h | 2 +- + init/Kconfig | 13 + + kernel/cpu.c | 4 +- + kernel/locking/locktorture.c | 2 +- + kernel/rcu/rcutorture.c | 31 +- + kernel/rcu/srcu.c | 29 +- + kernel/rcu/tiny.c | 14 +- + kernel/rcu/tiny_plugin.h | 12 +- + kernel/rcu/tree.c | 749 +++++++++++++-------- + kernel/rcu/tree.h | 45 +- + kernel/rcu/tree_plugin.h | 455 +++++++------ + kernel/rcu/tree_trace.c | 10 +- + kernel/rcu/update.c | 102 ++- + kernel/sched/idle.c | 9 +- + kernel/smpboot.c | 156 +++++ + lib/Kconfig.debug | 83 ++- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../selftests/rcutorture/configs/rcu/CFcommon | 3 + + .../selftests/rcutorture/configs/rcu/TREE03 | 6 +- + .../selftests/rcutorture/configs/rcu/TREE03.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE04 | 4 +- + .../selftests/rcutorture/configs/rcu/TREE08 | 2 +- + 38 files changed, 1324 insertions(+), 762 deletions(-) + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE03.boot +Merging kvm/linux-next (4ff6f8e61eb7 KVM: emulate: fix CMPXCHG8B on 32-bit hosts) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (174178fed338 KVM: arm/arm64: add irqfd support) +$ git merge kvm-arm/next +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 6 ++- + arch/arm/include/asm/kvm_host.h | 2 + + arch/arm/include/uapi/asm/kvm.h | 3 ++ + arch/arm/kernel/asm-offsets.c | 4 -- + arch/arm/kvm/Kconfig | 30 ++++---------- + arch/arm/kvm/Makefile | 10 ++--- + arch/arm/kvm/arm.c | 21 ++++------ + arch/arm/kvm/guest.c | 18 --------- + arch/arm/kvm/interrupts_head.S | 8 ---- + arch/arm64/include/asm/kvm_host.h | 2 + + arch/arm64/include/uapi/asm/kvm.h | 3 ++ + arch/arm64/kvm/Kconfig | 18 ++------- + arch/arm64/kvm/Makefile | 18 ++++----- + include/kvm/arm_arch_timer.h | 31 -------------- + include/kvm/arm_vgic.h | 85 --------------------------------------- + include/linux/kvm_host.h | 14 +++++++ + virt/kvm/arm/vgic.c | 67 +++++++++++++++++++++++++----- + virt/kvm/eventfd.c | 3 ++ + 18 files changed, 120 insertions(+), 223 deletions(-) +Merging kvm-ppc/kvm-ppc-next (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (44121ef71960 KVM: s390: Create ioctl for Getting/Setting guest storage keys) +$ git merge kvms390/next +Auto-merging arch/s390/kernel/asm-offsets.c +Auto-merging Documentation/virtual/kvm/api.txt +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 142 +++++++ + arch/s390/include/asm/kvm_host.h | 47 +- + arch/s390/include/uapi/asm/kvm.h | 4 + + arch/s390/include/uapi/asm/sie.h | 4 +- + arch/s390/kernel/asm-offsets.c | 1 + + arch/s390/kvm/diag.c | 4 +- + arch/s390/kvm/gaccess.c | 296 ++++++++++--- + arch/s390/kvm/gaccess.h | 21 +- + arch/s390/kvm/guestdbg.c | 8 +- + arch/s390/kvm/intercept.c | 5 +- + arch/s390/kvm/interrupt.c | 872 ++++++++++++++++++++++---------------- + arch/s390/kvm/kvm-s390.c | 345 +++++++++++++-- + arch/s390/kvm/kvm-s390.h | 35 +- + arch/s390/kvm/priv.c | 135 +++--- + arch/s390/kvm/sigp.c | 7 +- + include/uapi/linux/kvm.h | 49 ++- + 16 files changed, 1444 insertions(+), 531 deletions(-) +Merging xen-tip/linux-next (a2e75bc2ee20 xenbus: Add proper handling of XS_ERROR from Xenbus for transactions.) +$ 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 (3494fc30846d workqueue: dump workqueues on sysrq-t) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + drivers/tty/sysrq.c | 1 + + include/linux/workqueue.h | 1 + + kernel/workqueue.c | 212 ++++++++++++++++++++++++++++++++++++++++++---- + 3 files changed, 198 insertions(+), 16 deletions(-) +Merging drivers-x86/for-next (b4dd04ac6ef8 thinkpad_acpi: use DEVICE_ATTR_* macros) +$ git merge drivers-x86/for-next +Merge made by the 'recursive' strategy. + Documentation/laptops/thinkpad-acpi.txt | 18 ++ + drivers/platform/x86/thinkpad_acpi.c | 317 +++++++++++++++++++++----------- + 2 files changed, 232 insertions(+), 103 deletions(-) +Merging chrome-platform/for-next (8ce580932f8e platform/chrome: cros_ec_lpc - Depend on X86 || COMPILE_TEST) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + Documentation/ioctl/ioctl-number.txt | 1 + + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 51 +--- + drivers/input/keyboard/cros_ec_keyb.c | 13 +- + drivers/mfd/cros_ec.c | 19 +- + drivers/platform/chrome/Kconfig | 26 +- + drivers/platform/chrome/Makefile | 3 + + drivers/platform/chrome/cros_ec_dev.c | 274 +++++++++++++++++++++ + drivers/platform/chrome/cros_ec_dev.h | 53 +++++ + drivers/platform/chrome/cros_ec_lightbar.c | 367 +++++++++++++++++++++++++++++ + drivers/platform/chrome/cros_ec_lpc.c | 319 +++++++++++++++++++++++++ + drivers/platform/chrome/cros_ec_sysfs.c | 271 +++++++++++++++++++++ + include/linux/mfd/cros_ec.h | 23 +- + 12 files changed, 1358 insertions(+), 62 deletions(-) + create mode 100644 drivers/platform/chrome/cros_ec_dev.c + create mode 100644 drivers/platform/chrome/cros_ec_dev.h + create mode 100644 drivers/platform/chrome/cros_ec_lightbar.c + create mode 100644 drivers/platform/chrome/cros_ec_lpc.c + create mode 100644 drivers/platform/chrome/cros_ec_sysfs.c +Merging regmap/for-next (7d720ee52598 Merge remote-tracking branches 'regmap/fix/irq', 'regmap/fix/rbtree' and 'regmap/fix/sync' into regmap-linus) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regcache-rbtree.c | 2 +- + drivers/base/regmap/regcache.c | 6 ++++-- + drivers/base/regmap/regmap-irq.c | 3 ++- + 3 files changed, 7 insertions(+), 4 deletions(-) +Merging hsi/for-next (f034125dfdae HSI: nokia-modem: fix error return code) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/clients/nokia-modem.c | 1 + + 1 file changed, 1 insertion(+) +Merging leds/for-next (f6ad395bad57 Documentation: leds: Add description of LED Flash class extension) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-led-flash | 80 +++++++++++++++++++++ + .../devicetree/bindings/leds/leds-gpio.txt | 12 ++-- + Documentation/driver-model/devres.txt | 4 ++ + Documentation/leds/leds-class-flash.txt | 22 ++++++ + drivers/leds/led-class-flash.c | 82 ---------------------- + drivers/leds/led-class.c | 57 +++++++++++++++ + drivers/leds/leds-lp8860.c | 12 ++-- + drivers/leds/leds-pwm.c | 3 - + include/linux/led-class-flash.h | 15 ---- + include/linux/leds.h | 5 +- + 10 files changed, 181 insertions(+), 111 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-led-flash + create mode 100644 Documentation/leds/leds-class-flash.txt +Merging ipmi/for-next (3a31f945b709 ipmi: Remove incorrect use of seq_has_overflowed) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 4 ++-- + drivers/char/ipmi/ipmi_si_intf.c | 4 ++-- + drivers/char/ipmi/ipmi_ssif.c | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) +Merging driver-core/driver-core-next (c517d838eb7d Linux 4.0-rc1) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (48d7ff0eaacb drivers/tty: serial: remove info message) +$ git merge tty/tty-next +Auto-merging kernel/printk/printk.c +Removing include/linux/serial_mfd.h +Removing drivers/tty/serial/mfd.c +Auto-merging drivers/tty/serial/8250/8250_dw.c +Removing arch/x86/platform/intel-mid/early_printk_intel_mid.c +Merge made by the 'recursive' strategy. + arch/x86/Kconfig.debug | 4 - + arch/x86/include/asm/intel-mid.h | 3 - + arch/x86/include/asm/serial.h | 8 +- + arch/x86/kernel/early_printk.c | 6 - + arch/x86/platform/intel-mid/Makefile | 1 - + .../platform/intel-mid/early_printk_intel_mid.c | 112 -- + drivers/dma/Kconfig | 2 + + drivers/dma/Makefile | 1 + + drivers/dma/hsu/Kconfig | 14 + + drivers/dma/hsu/Makefile | 5 + + drivers/dma/hsu/hsu.c | 504 +++++++ + drivers/dma/hsu/hsu.h | 118 ++ + drivers/dma/hsu/pci.c | 123 ++ + drivers/tty/serial/8250/8250.h | 2 +- + drivers/tty/serial/8250/8250_core.c | 4 +- + drivers/tty/serial/8250/8250_dw.c | 15 +- + drivers/tty/serial/8250/8250_pci.c | 214 ++- + drivers/tty/serial/Kconfig | 16 +- + drivers/tty/serial/Makefile | 1 - + drivers/tty/serial/amba-pl011.c | 234 +-- + drivers/tty/serial/ar933x_uart.c | 2 +- + drivers/tty/serial/atmel_serial.c | 29 +- + drivers/tty/serial/bcm63xx_uart.c | 4 +- + drivers/tty/serial/clps711x.c | 2 + + drivers/tty/serial/earlycon.c | 39 +- + drivers/tty/serial/imx.c | 317 ++--- + drivers/tty/serial/max3100.c | 2 +- + drivers/tty/serial/mfd.c | 1505 -------------------- + drivers/tty/serial/mxs-auart.c | 16 +- + drivers/tty/serial/serial_core.c | 49 +- + drivers/tty/serial/serial_mctrl_gpio.c | 50 +- + drivers/tty/serial/sprd_serial.c | 6 +- + drivers/tty/serial/xilinx_uartps.c | 3 +- + drivers/tty/vt/vt.c | 4 +- + drivers/tty/vt/vt_ioctl.c | 2 +- + include/linux/dma/hsu.h | 48 + + include/linux/platform_data/dma-hsu.h | 25 + + include/linux/platform_data/serial-imx.h | 5 - + include/linux/serial_core.h | 2 + + include/linux/serial_mfd.h | 47 - + include/uapi/linux/serial_reg.h | 19 - + kernel/printk/printk.c | 1 - + 42 files changed, 1426 insertions(+), 2138 deletions(-) + delete mode 100644 arch/x86/platform/intel-mid/early_printk_intel_mid.c + create mode 100644 drivers/dma/hsu/Kconfig + create mode 100644 drivers/dma/hsu/Makefile + create mode 100644 drivers/dma/hsu/hsu.c + create mode 100644 drivers/dma/hsu/hsu.h + create mode 100644 drivers/dma/hsu/pci.c + delete mode 100644 drivers/tty/serial/mfd.c + create mode 100644 include/linux/dma/hsu.h + create mode 100644 include/linux/platform_data/dma-hsu.h + delete mode 100644 include/linux/serial_mfd.h +Merging usb/usb-next (9eccca084320 Linux 4.0-rc3) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (e39af88f18df usb: dwc2: rework initialization of host and gadget in dual-role mode) +$ git merge usb-gadget/next +Auto-merging drivers/usb/phy/phy-ab8500-usb.c +Merge made by the 'recursive' strategy. + .../ABI/testing/configfs-usb-gadget-printer | 9 + + Documentation/devicetree/bindings/usb/dwc3.txt | 1 + + Documentation/usb/gadget-testing.txt | 47 + + drivers/usb/dwc2/Kconfig | 7 +- + drivers/usb/dwc2/core.h | 2 + + drivers/usb/dwc2/pci.c | 160 +-- + drivers/usb/dwc2/platform.c | 29 +- + drivers/usb/dwc3/Kconfig | 7 - + drivers/usb/dwc3/core.c | 59 +- + drivers/usb/dwc3/core.h | 2 + + drivers/usb/dwc3/dwc3-omap.c | 11 +- + drivers/usb/dwc3/dwc3-pci.c | 2 - + drivers/usb/dwc3/gadget.c | 37 +- + drivers/usb/dwc3/host.c | 4 +- + drivers/usb/dwc3/platform_data.h | 1 + + drivers/usb/gadget/Kconfig | 16 + + drivers/usb/gadget/composite.c | 17 +- + drivers/usb/gadget/function/Makefile | 2 + + drivers/usb/gadget/function/f_hid.c | 1 - + drivers/usb/gadget/function/f_mass_storage.c | 2 +- + drivers/usb/gadget/function/f_printer.c | 1475 ++++++++++++++++++++ + drivers/usb/gadget/function/u_printer.h | 37 + + drivers/usb/gadget/legacy/Kconfig | 1 + + drivers/usb/gadget/legacy/printer.c | 1239 +--------------- + drivers/usb/gadget/udc/atmel_usba_udc.c | 208 ++- + drivers/usb/gadget/udc/atmel_usba_udc.h | 4 + + drivers/usb/gadget/udc/dummy_hcd.c | 2 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 15 +- + drivers/usb/gadget/udc/net2280.c | 182 ++- + drivers/usb/gadget/udc/net2280.h | 2 - + drivers/usb/gadget/udc/pxa27x_udc.c | 132 +- + drivers/usb/musb/musb_core.c | 214 +-- + drivers/usb/musb/musb_core.h | 14 +- + drivers/usb/musb/musb_cppi41.c | 84 +- + drivers/usb/musb/musb_dsps.c | 82 +- + drivers/usb/musb/musb_gadget.c | 40 +- + drivers/usb/phy/of.c | 2 +- + drivers/usb/phy/phy-ab8500-usb.c | 2 +- + drivers/usb/phy/phy-generic.c | 12 +- + include/linux/pci_ids.h | 2 + + include/linux/usb/composite.h | 3 + + include/linux/usb/gadget.h | 2 +- + 42 files changed, 2351 insertions(+), 1819 deletions(-) + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-printer + create mode 100644 drivers/usb/gadget/function/f_printer.c + create mode 100644 drivers/usb/gadget/function/u_printer.h +Merging usb-serial/usb-next (394a10331a9e USB: ch341: remove redundant close from open error path) +$ git merge usb-serial/usb-next +Auto-merging drivers/usb/serial/ch341.c +Merge made by the 'recursive' strategy. + drivers/usb/serial/ch341.c | 1 - + 1 file changed, 1 deletion(-) +Merging staging/staging-next (7aa5d5097dba Staging: rtl8192u: Use __packed instead of __attribute__((packed))) +$ git merge staging/staging-next +Auto-merging drivers/staging/vt6655/device_main.c +Removing drivers/staging/unisys/include/uniklog.h +Auto-merging drivers/staging/unisys/include/timskmod.h +Removing drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c +Removing drivers/staging/comedi/drivers/8253.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 14 + + drivers/dma/ste_dma40.c | 2 +- + drivers/staging/Kconfig | 4 + + drivers/staging/Makefile | 2 + + drivers/staging/android/ion/ion.c | 14 +- + drivers/staging/comedi/Kconfig | 27 + + drivers/staging/comedi/comedi_fops.c | 22 +- + drivers/staging/comedi/comedidev.h | 1 + + drivers/staging/comedi/drivers.c | 10 +- + drivers/staging/comedi/drivers/8253.h | 347 --- + drivers/staging/comedi/drivers/8255_pci.c | 2 +- + drivers/staging/comedi/drivers/Makefile | 1 + + drivers/staging/comedi/drivers/addi_apci_1032.c | 4 +- + drivers/staging/comedi/drivers/addi_apci_1500.c | 4 +- + drivers/staging/comedi/drivers/addi_apci_1564.c | 4 +- + drivers/staging/comedi/drivers/addi_apci_3501.c | 2 +- + drivers/staging/comedi/drivers/addi_watchdog.c | 2 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 46 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 2 +- + drivers/staging/comedi/drivers/adl_pci9111.c | 46 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 96 +- + drivers/staging/comedi/drivers/adq12b.c | 3 - + drivers/staging/comedi/drivers/adv_pci1710.c | 208 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 136 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 336 +-- + .../staging/comedi/drivers/amplc_pc236_common.c | 1 - + drivers/staging/comedi/drivers/amplc_pci224.c | 39 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 49 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 14 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 91 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 46 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 367 ++- + drivers/staging/comedi/drivers/cb_pcimdda.c | 2 +- + drivers/staging/comedi/drivers/comedi_8254.c | 664 +++++ + drivers/staging/comedi/drivers/comedi_8254.h | 133 + + drivers/staging/comedi/drivers/comedi_bond.c | 7 +- + drivers/staging/comedi/drivers/comedi_isadma.c | 3 +- + drivers/staging/comedi/drivers/comedi_test.c | 5 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 2 +- + drivers/staging/comedi/drivers/daqboard2000.c | 2 +- + drivers/staging/comedi/drivers/das08.c | 79 +- + drivers/staging/comedi/drivers/das16.c | 46 +- + drivers/staging/comedi/drivers/das16m1.c | 81 +- + drivers/staging/comedi/drivers/das1800.c | 86 +- + drivers/staging/comedi/drivers/das6402.c | 51 +- + drivers/staging/comedi/drivers/das800.c | 42 +- + drivers/staging/comedi/drivers/dmm32at.c | 5 +- + drivers/staging/comedi/drivers/dt2801.c | 3 +- + drivers/staging/comedi/drivers/dt2811.c | 1 - + drivers/staging/comedi/drivers/dt2814.c | 2 - + drivers/staging/comedi/drivers/dt2815.c | 1 - + drivers/staging/comedi/drivers/dt282x.c | 3 +- + drivers/staging/comedi/drivers/dyna_pci10xx.c | 17 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 1 - + drivers/staging/comedi/drivers/icp_multi.c | 3 +- + drivers/staging/comedi/drivers/me4000.c | 139 +- + drivers/staging/comedi/drivers/mf6x4.c | 1 - + drivers/staging/comedi/drivers/mite.c | 6 +- + drivers/staging/comedi/drivers/mpc624.c | 1 - + drivers/staging/comedi/drivers/ni_65xx.c | 4 +- + drivers/staging/comedi/drivers/ni_660x.c | 7 +- + drivers/staging/comedi/drivers/ni_670x.c | 2 +- + drivers/staging/comedi/drivers/ni_at_a2150.c | 17 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 14 +- + drivers/staging/comedi/drivers/ni_atmio.c | 4 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 1 - + drivers/staging/comedi/drivers/ni_labpc.c | 1 + + drivers/staging/comedi/drivers/ni_labpc.h | 16 +- + drivers/staging/comedi/drivers/ni_labpc_common.c | 187 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 14 +- + drivers/staging/comedi/drivers/ni_labpc_pci.c | 10 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 62 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 7 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 11 +- + drivers/staging/comedi/drivers/ni_tiocmd.c | 8 +- + drivers/staging/comedi/drivers/pcl711.c | 42 +- + drivers/staging/comedi/drivers/pcl812.c | 57 +- + drivers/staging/comedi/drivers/pcl816.c | 62 +- + drivers/staging/comedi/drivers/pcl818.c | 80 +- + drivers/staging/comedi/drivers/pcmuio.c | 4 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 - + drivers/staging/comedi/drivers/rtd520.c | 15 +- + drivers/staging/comedi/drivers/s626.c | 28 +- + drivers/staging/comedi/drivers/serial2002.c | 3 - + drivers/staging/comedi/drivers/ssv_dnp.c | 1 - + drivers/staging/comedi/drivers/unioxx5.c | 9 +- + drivers/staging/comedi/drivers/usbdux.c | 5 +- + drivers/staging/comedi/drivers/usbduxfast.c | 1 - + drivers/staging/comedi/drivers/usbduxsigma.c | 26 +- + .../staging/comedi/kcomedilib/kcomedilib_main.c | 2 +- + drivers/staging/dgap/dgap.c | 11 +- + drivers/staging/dgap/dgap.h | 2 +- + drivers/staging/dgnc/Makefile | 2 - + drivers/staging/dgnc/TODO | 6 +- + drivers/staging/dgnc/dgnc_cls.c | 71 +- + drivers/staging/dgnc/dgnc_cls.h | 47 +- + drivers/staging/dgnc/dgnc_driver.c | 74 +- + drivers/staging/dgnc/dgnc_driver.h | 18 +- + drivers/staging/dgnc/dgnc_kcompat.h | 6 - + drivers/staging/dgnc/dgnc_mgmt.c | 19 +- + drivers/staging/dgnc/dgnc_mgmt.h | 6 - + drivers/staging/dgnc/dgnc_neo.c | 82 +- + drivers/staging/dgnc/dgnc_neo.h | 7 - + drivers/staging/dgnc/dgnc_pci.h | 6 - + drivers/staging/dgnc/dgnc_sysfs.c | 18 +- + drivers/staging/dgnc/dgnc_sysfs.h | 6 - + drivers/staging/dgnc/dgnc_tty.c | 67 +- + drivers/staging/dgnc/dgnc_tty.h | 6 - + drivers/staging/dgnc/dgnc_types.h | 6 - + drivers/staging/dgnc/digi.h | 6 - + drivers/staging/dgnc/dpacompat.h | 6 - + drivers/staging/emxx_udc/emxx_udc.c | 151 +- + drivers/staging/emxx_udc/emxx_udc.h | 28 +- + drivers/staging/fbtft/README | 12 +- + drivers/staging/fbtft/fb_agm1264k-fl.c | 16 +- + drivers/staging/fbtft/fb_bd663474.c | 100 +- + drivers/staging/fbtft/fb_hx8340bn.c | 2 +- + drivers/staging/fbtft/fb_ili9320.c | 1 + + drivers/staging/fbtft/fb_ili9340.c | 10 +- + drivers/staging/fbtft/fb_ili9486.c | 6 +- + drivers/staging/fbtft/fb_pcd8544.c | 6 +- + drivers/staging/fbtft/fb_ra8875.c | 158 +- + drivers/staging/fbtft/fb_s6d1121.c | 2 +- + drivers/staging/fbtft/fb_ssd1306.c | 4 +- + drivers/staging/fbtft/fb_ssd1331.c | 42 +- + drivers/staging/fbtft/fb_ssd1351.c | 7 +- + drivers/staging/fbtft/fb_st7735r.c | 8 +- + drivers/staging/fbtft/fb_tls8204.c | 2 +- + drivers/staging/fbtft/fb_uc1701.c | 3 +- + drivers/staging/fbtft/fb_upd161704.c | 90 +- + drivers/staging/fbtft/fb_watterott.c | 2 +- + drivers/staging/fbtft/fbtft-bus.c | 2 +- + drivers/staging/fbtft/fbtft-core.c | 30 +- + drivers/staging/fbtft/fbtft-io.c | 7 +- + drivers/staging/fbtft/fbtft_device.c | 92 +- + drivers/staging/fbtft/internal.h | 25 + + drivers/staging/fsl-mc/Kconfig | 1 + + drivers/staging/fsl-mc/Makefile | 2 + + drivers/staging/fsl-mc/TODO | 12 + + drivers/staging/fsl-mc/bus/Kconfig | 24 + + drivers/staging/fsl-mc/bus/Makefile | 19 + + drivers/staging/fsl-mc/bus/dpbp.c | 358 +++ + drivers/staging/fsl-mc/bus/dpmcp-cmd.h | 136 + + drivers/staging/fsl-mc/bus/dpmcp.c | 308 +++ + drivers/staging/fsl-mc/bus/dpmcp.h | 311 +++ + drivers/staging/fsl-mc/bus/dpmng-cmd.h | 47 + + drivers/staging/fsl-mc/bus/dpmng.c | 78 + + drivers/staging/fsl-mc/bus/dprc-cmd.h | 84 + + drivers/staging/fsl-mc/bus/dprc-driver.c | 486 ++++ + drivers/staging/fsl-mc/bus/dprc.c | 913 +++++++ + drivers/staging/fsl-mc/bus/mc-allocator.c | 569 +++++ + drivers/staging/fsl-mc/bus/mc-bus.c | 763 ++++++ + drivers/staging/fsl-mc/bus/mc-sys.c | 287 +++ + drivers/staging/fsl-mc/include/dpbp-cmd.h | 60 + + drivers/staging/fsl-mc/include/dpbp.h | 330 +++ + drivers/staging/fsl-mc/include/dpcon-cmd.h | 62 + + drivers/staging/fsl-mc/include/dpmng.h | 80 + + drivers/staging/fsl-mc/include/dprc.h | 801 ++++++ + drivers/staging/fsl-mc/include/mc-cmd.h | 113 + + drivers/staging/fsl-mc/include/mc-private.h | 112 + + drivers/staging/fsl-mc/include/mc-sys.h | 76 + + drivers/staging/fsl-mc/include/mc.h | 201 ++ + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 291 ++- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 13 +- + drivers/staging/gdm72xx/gdm_qos.c | 3 +- + drivers/staging/gdm72xx/gdm_sdio.c | 6 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 1 - + drivers/staging/i2o/config-osm.c | 2 +- + drivers/staging/i2o/debug.c | 7 +- + drivers/staging/i2o/device.c | 4 +- + drivers/staging/i2o/driver.c | 7 +- + drivers/staging/i2o/exec-osm.c | 4 +- + drivers/staging/i2o/i2o_config.c | 3 +- + drivers/staging/i2o/i2o_proc.c | 26 +- + drivers/staging/iio/Documentation/generic_buffer.c | 2 +- + drivers/staging/iio/Documentation/iio_utils.h | 4 + + drivers/staging/iio/accel/adis16220_core.c | 7 +- + drivers/staging/iio/accel/sca3000.h | 5 +- + drivers/staging/iio/accel/sca3000_core.c | 6 +- + drivers/staging/iio/frequency/dds.h | 4 + + drivers/staging/iio/iio_simple_dummy.c | 1 - + drivers/staging/iio/light/isl29028.c | 8 +- + drivers/staging/iio/light/tsl2583.c | 4 +- + drivers/staging/iio/light/tsl2x7x_core.c | 34 +- + drivers/staging/iio/magnetometer/hmc5843_core.c | 1 + + drivers/staging/iio/meter/ade7758_core.c | 35 +- + drivers/staging/iio/meter/ade7758_ring.c | 3 +- + drivers/staging/iio/meter/ade7759.c | 5 +- + drivers/staging/iio/meter/ade7854-i2c.c | 44 +- + drivers/staging/iio/meter/ade7854-spi.c | 6 +- + drivers/staging/iio/meter/meter.h | 4 + + drivers/staging/iio/resolver/ad2s1210.h | 3 + + .../lustre/include/linux/libcfs/libcfs_hash.h | 6 +- + .../include/linux/libcfs/libcfs_kernelcomm.h | 4 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 211 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 2 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 382 +-- + .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 18 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 448 ++-- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 130 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 104 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.h | 2 +- + .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 6 +- + .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 40 +- + drivers/staging/lustre/lnet/lnet/lib-eq.c | 3 +- + drivers/staging/lustre/lnet/lnet/router.c | 74 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 2 +- + drivers/staging/lustre/lnet/selftest/console.c | 80 +- + drivers/staging/lustre/lnet/selftest/framework.c | 220 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 163 +- + drivers/staging/lustre/lustre/fid/lproc_fid.c | 23 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 7 +- + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 5 +- + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 3 +- + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 10 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 2 - + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 1 - + drivers/staging/lustre/lustre/libcfs/Makefile | 2 +- + drivers/staging/lustre/lustre/libcfs/debug.c | 2 +- + drivers/staging/lustre/lustre/libcfs/hash.c | 13 +- + .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 78 +- + .../lustre/lustre/libcfs/linux/linux-debug.c | 2 +- + .../lustre/lustre/libcfs/linux/linux-prim.c | 2 +- + .../lustre/lustre/libcfs/linux/linux-proc.c | 577 ----- + drivers/staging/lustre/lustre/libcfs/module.c | 566 ++++- + drivers/staging/lustre/lustre/libcfs/tracefile.c | 28 +- + drivers/staging/lustre/lustre/libcfs/workitem.c | 2 +- + drivers/staging/lustre/lustre/llite/dcache.c | 5 +- + drivers/staging/lustre/lustre/llite/dir.c | 31 +- + drivers/staging/lustre/lustre/llite/file.c | 10 +- + drivers/staging/lustre/lustre/llite/llite_close.c | 4 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 21 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 4 +- + drivers/staging/lustre/lustre/llite/lloop.c | 3 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 117 +- + drivers/staging/lustre/lustre/llite/rw.c | 2 +- + drivers/staging/lustre/lustre/llite/rw26.c | 2 +- + drivers/staging/lustre/lustre/llite/statahead.c | 2 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 2 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 5 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 4 +- + drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 18 +- + drivers/staging/lustre/lustre/lov/lov_dev.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_ea.c | 8 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 26 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 2 +- + drivers/staging/lustre/lustre/lov/lproc_lov.c | 36 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 6 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 4 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 9 +- + drivers/staging/lustre/lustre/obdclass/dt_object.c | 5 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 2 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 38 +- + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 2 +- + drivers/staging/lustre/lustre/obdclass/llog_cat.c | 5 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 110 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 33 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 42 +- + drivers/staging/lustre/lustre/obdecho/lproc_echo.c | 2 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 69 +- + drivers/staging/lustre/lustre/osc/osc_lock.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 12 +- + drivers/staging/lustre/lustre/ptlrpc/connection.c | 1 + + drivers/staging/lustre/lustre/ptlrpc/layout.c | 6 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 29 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 8 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 2 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 4 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 10 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 82 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 9 +- + drivers/staging/media/bcm2048/radio-bcm2048.c | 3 +- + drivers/staging/media/cxd2099/cxd2099.c | 1 - + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 3 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 1 - + drivers/staging/media/lirc/lirc_imon.c | 26 +- + drivers/staging/media/lirc/lirc_sasem.c | 18 +- + drivers/staging/media/lirc/lirc_serial.c | 2 +- + drivers/staging/media/lirc/lirc_sir.c | 4 +- + drivers/staging/media/lirc/lirc_zilog.c | 3 +- + drivers/staging/media/mn88473/mn88473.c | 24 +- + drivers/staging/media/omap4iss/iss.c | 16 +- + drivers/staging/media/omap4iss/iss_video.c | 3 +- + drivers/staging/nvec/Kconfig | 18 + + drivers/staging/ozwpan/ozhcd.c | 23 +- + drivers/staging/ozwpan/ozpd.c | 63 +- + drivers/staging/ozwpan/ozproto.c | 2 +- + drivers/staging/panel/panel.c | 63 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 28 +- + .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 3 +- + drivers/staging/rtl8188eu/hal/bb_cfg.c | 57 +- + drivers/staging/rtl8188eu/hal/fw.c | 3 +- + drivers/staging/rtl8188eu/hal/odm.c | 8 +- + drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 2 +- + drivers/staging/rtl8188eu/hal/phy.c | 164 +- + drivers/staging/rtl8188eu/hal/rf_cfg.c | 4 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 3 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 2 +- + drivers/staging/rtl8188eu/include/wifi.h | 52 +- + drivers/staging/rtl8188eu/include/wlan_bssdef.h | 10 - + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 14 +- + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 1 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +- + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 16 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 32 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 10 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 6 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 24 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 - + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 12 - + drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- + drivers/staging/rtl8192e/rtllib_module.c | 14 +- + drivers/staging/rtl8192e/rtllib_rx.c | 22 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +- + drivers/staging/rtl8192e/rtllib_wx.c | 26 +- + drivers/staging/rtl8192u/ieee80211/dot11d.c | 2 +- + drivers/staging/rtl8192u/ieee80211/dot11d.h | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 87 +- + .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 19 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 11 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 3 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 11 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 21 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 3 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 16 +- + .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 9 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 2 +- + drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 14 +- + drivers/staging/rtl8192u/r8190_rtl8256.c | 4 +- + drivers/staging/rtl8192u/r8190_rtl8256.h | 5 +- + drivers/staging/rtl8192u/r8192U.h | 2 - + drivers/staging/rtl8192u/r8192U_core.c | 53 +- + drivers/staging/rtl8192u/r8192U_dm.c | 54 +- + drivers/staging/rtl8192u/r8192U_wx.c | 2 +- + drivers/staging/rtl8192u/r8192U_wx.h | 25 +- + drivers/staging/rtl8192u/r819xU_firmware.c | 48 +- + drivers/staging/rtl8192u/r819xU_phy.c | 32 +- + drivers/staging/rtl8712/hal_init.c | 2 +- + drivers/staging/rtl8712/mlme_linux.c | 55 +- + drivers/staging/rtl8712/os_intfs.c | 11 +- + drivers/staging/rtl8712/osdep_service.h | 14 - + drivers/staging/rtl8712/recv_linux.c | 13 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 2 +- + drivers/staging/rtl8712/rtl8712_led.c | 327 +-- + drivers/staging/rtl8712/rtl8712_recv.c | 20 +- + drivers/staging/rtl8712/rtl871x_cmd.c | 19 +- + drivers/staging/rtl8712/rtl871x_eeprom.c | 4 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 16 +- + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 3 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 14 +- + drivers/staging/rtl8712/rtl871x_mp.c | 4 +- + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 8 +- + drivers/staging/rtl8712/rtl871x_recv.c | 3 +- + drivers/staging/rtl8712/rtl871x_security.c | 12 +- + drivers/staging/rtl8712/rtl871x_security.h | 2 +- + drivers/staging/rtl8712/wifi.h | 23 - + drivers/staging/rtl8723au/core/rtw_ap.c | 13 +- + drivers/staging/rtl8723au/core/rtw_cmd.c | 2 +- + drivers/staging/rtl8723au/core/rtw_efuse.c | 3 +- + drivers/staging/rtl8723au/core/rtw_security.c | 4 +- + .../staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c | 259 +- + drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c | 53 +- + drivers/staging/rtl8723au/hal/HalHWImg8723A_MAC.c | 7 +- + drivers/staging/rtl8723au/hal/HalHWImg8723A_RF.c | 7 +- + drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c | 1 - + drivers/staging/rtl8723au/hal/hal_com.c | 44 +- + drivers/staging/rtl8723au/hal/odm.c | 737 +++--- + drivers/staging/rtl8723au/hal/odm_HWConfig.c | 35 +- + drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c | 52 +- + drivers/staging/rtl8723au/hal/odm_interface.c | 90 - + .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 28 +- + drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 28 +- + drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 21 +- + drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 57 +- + drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 60 +- + drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 2 +- + drivers/staging/rtl8723au/hal/usb_halinit.c | 107 +- + drivers/staging/rtl8723au/include/Hal8723APhyCfg.h | 12 - + drivers/staging/rtl8723au/include/HalVerDef.h | 22 - + drivers/staging/rtl8723au/include/hal_com.h | 31 - + drivers/staging/rtl8723au/include/hal_intf.h | 7 - + drivers/staging/rtl8723au/include/ieee80211.h | 14 - + drivers/staging/rtl8723au/include/odm.h | 142 +- + .../staging/rtl8723au/include/odm_RegConfig8723A.h | 5 +- + drivers/staging/rtl8723au/include/odm_interface.h | 11 - + drivers/staging/rtl8723au/include/rtl8723a_hal.h | 2 - + drivers/staging/rtl8723au/os_dep/usb_intf.c | 3 +- + drivers/staging/rts5208/ms.c | 23 +- + drivers/staging/rts5208/ms.h | 2 +- + drivers/staging/rts5208/rtsx.c | 4 +- + drivers/staging/rts5208/rtsx_chip.c | 56 +- + drivers/staging/rts5208/rtsx_scsi.c | 47 +- + drivers/staging/rts5208/rtsx_transport.c | 2 +- + drivers/staging/rts5208/sd.c | 124 +- + drivers/staging/rts5208/sd.h | 2 +- + drivers/staging/slicoss/slicoss.c | 30 +- + drivers/staging/sm750fb/Kconfig | 10 + + drivers/staging/sm750fb/Makefile | 4 + + drivers/staging/sm750fb/TODO | 15 + + drivers/staging/sm750fb/ddk750.h | 24 + + drivers/staging/sm750fb/ddk750_chip.c | 639 +++++ + drivers/staging/sm750fb/ddk750_chip.h | 87 + + drivers/staging/sm750fb/ddk750_display.c | 307 +++ + drivers/staging/sm750fb/ddk750_display.h | 160 ++ + drivers/staging/sm750fb/ddk750_dvi.c | 99 + + drivers/staging/sm750fb/ddk750_dvi.h | 67 + + drivers/staging/sm750fb/ddk750_help.c | 19 + + drivers/staging/sm750fb/ddk750_help.h | 29 + + drivers/staging/sm750fb/ddk750_hwi2c.c | 271 ++ + drivers/staging/sm750fb/ddk750_hwi2c.h | 10 + + drivers/staging/sm750fb/ddk750_mode.c | 205 ++ + drivers/staging/sm750fb/ddk750_mode.h | 43 + + drivers/staging/sm750fb/ddk750_power.c | 239 ++ + drivers/staging/sm750fb/ddk750_power.h | 71 + + drivers/staging/sm750fb/ddk750_reg.h | 2616 ++++++++++++++++++++ + drivers/staging/sm750fb/ddk750_sii164.c | 425 ++++ + drivers/staging/sm750fb/ddk750_sii164.h | 172 ++ + drivers/staging/sm750fb/ddk750_swi2c.c | 524 ++++ + drivers/staging/sm750fb/ddk750_swi2c.h | 92 + + drivers/staging/sm750fb/modedb.h | 221 ++ + drivers/staging/sm750fb/readme | 38 + + drivers/staging/sm750fb/sm750.c | 1380 +++++++++++ + drivers/staging/sm750fb/sm750.h | 186 ++ + drivers/staging/sm750fb/sm750_accel.c | 515 ++++ + drivers/staging/sm750fb/sm750_accel.h | 275 ++ + drivers/staging/sm750fb/sm750_cursor.c | 251 ++ + drivers/staging/sm750fb/sm750_cursor.h | 17 + + drivers/staging/sm750fb/sm750_help.h | 111 + + drivers/staging/sm750fb/sm750_hw.c | 642 +++++ + drivers/staging/sm750fb/sm750_hw.h | 104 + + drivers/staging/sm7xxfb/sm7xx.h | 2 +- + drivers/staging/speakup/kobjects.c | 4 +- + drivers/staging/speakup/main.c | 2 +- + drivers/staging/speakup/spk_priv.h | 52 +- + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 12 +- + .../common-spar/include/channels/iochannel.h | 2 +- + .../unisys/common-spar/include/vmcallinterface.h | 9 +- + drivers/staging/unisys/include/procobjecttree.h | 1 - + drivers/staging/unisys/include/timskmod.h | 16 - + drivers/staging/unisys/include/uisqueue.h | 1 - + drivers/staging/unisys/include/uisthread.h | 1 - + drivers/staging/unisys/include/uisutils.h | 33 - + drivers/staging/unisys/include/uniklog.h | 191 -- + drivers/staging/unisys/uislib/Kconfig | 2 +- + drivers/staging/unisys/uislib/Makefile | 2 - + drivers/staging/unisys/uislib/uislib.c | 199 +- + drivers/staging/unisys/uislib/uisqueue.c | 6 +- + drivers/staging/unisys/uislib/uisthread.c | 27 +- + drivers/staging/unisys/uislib/uisutils.c | 197 -- + drivers/staging/unisys/virthba/Kconfig | 5 +- + drivers/staging/unisys/virthba/Makefile | 1 - + drivers/staging/unisys/virthba/virthba.c | 250 +- + drivers/staging/unisys/virtpci/Kconfig | 2 +- + drivers/staging/unisys/virtpci/virtpci.c | 232 +- + drivers/staging/unisys/visorchannel/Kconfig | 2 +- + drivers/staging/unisys/visorchannel/globals.h | 1 - + .../unisys/visorchannel/visorchannel_funcs.c | 73 +- + .../unisys/visorchannel/visorchannel_main.c | 2 - + drivers/staging/unisys/visorchipset/Kconfig | 3 +- + drivers/staging/unisys/visorchipset/file.c | 42 +- + drivers/staging/unisys/visorchipset/globals.h | 1 - + drivers/staging/unisys/visorchipset/parser.c | 68 +- + drivers/staging/unisys/visorchipset/parser.h | 1 - + .../unisys/visorchipset/visorchipset_main.c | 305 +-- + drivers/staging/unisys/visorutil/Kconfig | 1 - + drivers/staging/unisys/visorutil/charqueue.c | 8 +- + drivers/staging/unisys/visorutil/charqueue.h | 1 - + drivers/staging/unisys/visorutil/easyproc.c | 27 +- + .../staging/unisys/visorutil/memregion_direct.c | 46 +- + drivers/staging/unisys/visorutil/periodic_work.c | 15 +- + drivers/staging/unisys/visorutil/procobjecttree.c | 46 +- + drivers/staging/unisys/visorutil/visorkmodutils.c | 1 - + drivers/staging/vme/devices/vme_pio2_core.c | 1 - + drivers/staging/vme/devices/vme_pio2_gpio.c | 1 - + drivers/staging/vme/devices/vme_user.c | 94 +- + drivers/staging/vt6655/channel.c | 9 +- + drivers/staging/vt6655/device_main.c | 36 +- + drivers/staging/vt6655/key.h | 2 +- + drivers/staging/vt6655/mac.c | 82 +- + drivers/staging/vt6655/mib.c | 46 +- + drivers/staging/vt6655/rxtx.c | 10 +- + drivers/staging/vt6655/srom.h | 53 +- + drivers/staging/vt6655/tmacro.h | 2 +- + drivers/staging/vt6656/firmware.c | 2 +- + drivers/staging/vt6656/mac.c | 4 +- + drivers/staging/vt6656/rxtx.c | 8 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 19 +- + drivers/staging/wlan-ng/prism2mib.c | 11 +- + drivers/staging/wlan-ng/prism2sta.c | 6 +- + drivers/staging/xgifb/XGI_main_26.c | 6 +- + drivers/staging/xgifb/vb_setmode.c | 140 +- + drivers/vme/bridges/vme_tsi148.c | 11 +- + drivers/vme/vme.c | 26 + + include/linux/vme.h | 1 + + 505 files changed, 23088 insertions(+), 9301 deletions(-) + delete mode 100644 drivers/staging/comedi/drivers/8253.h + create mode 100644 drivers/staging/comedi/drivers/comedi_8254.c + create mode 100644 drivers/staging/comedi/drivers/comedi_8254.h + create mode 100644 drivers/staging/fbtft/internal.h + create mode 100644 drivers/staging/fsl-mc/Kconfig + create mode 100644 drivers/staging/fsl-mc/Makefile + create mode 100644 drivers/staging/fsl-mc/TODO + create mode 100644 drivers/staging/fsl-mc/bus/Kconfig + create mode 100644 drivers/staging/fsl-mc/bus/Makefile + create mode 100644 drivers/staging/fsl-mc/bus/dpbp.c + create mode 100644 drivers/staging/fsl-mc/bus/dpmcp-cmd.h + create mode 100644 drivers/staging/fsl-mc/bus/dpmcp.c + create mode 100644 drivers/staging/fsl-mc/bus/dpmcp.h + create mode 100644 drivers/staging/fsl-mc/bus/dpmng-cmd.h + create mode 100644 drivers/staging/fsl-mc/bus/dpmng.c + create mode 100644 drivers/staging/fsl-mc/bus/dprc-cmd.h + create mode 100644 drivers/staging/fsl-mc/bus/dprc-driver.c + create mode 100644 drivers/staging/fsl-mc/bus/dprc.c + create mode 100644 drivers/staging/fsl-mc/bus/mc-allocator.c + create mode 100644 drivers/staging/fsl-mc/bus/mc-bus.c + create mode 100644 drivers/staging/fsl-mc/bus/mc-sys.c + create mode 100644 drivers/staging/fsl-mc/include/dpbp-cmd.h + create mode 100644 drivers/staging/fsl-mc/include/dpbp.h + create mode 100644 drivers/staging/fsl-mc/include/dpcon-cmd.h + create mode 100644 drivers/staging/fsl-mc/include/dpmng.h + create mode 100644 drivers/staging/fsl-mc/include/dprc.h + create mode 100644 drivers/staging/fsl-mc/include/mc-cmd.h + create mode 100644 drivers/staging/fsl-mc/include/mc-private.h + create mode 100644 drivers/staging/fsl-mc/include/mc-sys.h + create mode 100644 drivers/staging/fsl-mc/include/mc.h + delete mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c + create mode 100644 drivers/staging/sm750fb/Kconfig + create mode 100644 drivers/staging/sm750fb/Makefile + create mode 100644 drivers/staging/sm750fb/TODO + create mode 100644 drivers/staging/sm750fb/ddk750.h + create mode 100644 drivers/staging/sm750fb/ddk750_chip.c + create mode 100644 drivers/staging/sm750fb/ddk750_chip.h + create mode 100644 drivers/staging/sm750fb/ddk750_display.c + create mode 100644 drivers/staging/sm750fb/ddk750_display.h + create mode 100644 drivers/staging/sm750fb/ddk750_dvi.c + create mode 100644 drivers/staging/sm750fb/ddk750_dvi.h + create mode 100644 drivers/staging/sm750fb/ddk750_help.c + create mode 100644 drivers/staging/sm750fb/ddk750_help.h + create mode 100644 drivers/staging/sm750fb/ddk750_hwi2c.c + create mode 100644 drivers/staging/sm750fb/ddk750_hwi2c.h + create mode 100644 drivers/staging/sm750fb/ddk750_mode.c + create mode 100644 drivers/staging/sm750fb/ddk750_mode.h + create mode 100644 drivers/staging/sm750fb/ddk750_power.c + create mode 100644 drivers/staging/sm750fb/ddk750_power.h + create mode 100644 drivers/staging/sm750fb/ddk750_reg.h + create mode 100644 drivers/staging/sm750fb/ddk750_sii164.c + create mode 100644 drivers/staging/sm750fb/ddk750_sii164.h + create mode 100644 drivers/staging/sm750fb/ddk750_swi2c.c + create mode 100644 drivers/staging/sm750fb/ddk750_swi2c.h + create mode 100644 drivers/staging/sm750fb/modedb.h + create mode 100644 drivers/staging/sm750fb/readme + create mode 100644 drivers/staging/sm750fb/sm750.c + create mode 100644 drivers/staging/sm750fb/sm750.h + create mode 100644 drivers/staging/sm750fb/sm750_accel.c + create mode 100644 drivers/staging/sm750fb/sm750_accel.h + create mode 100644 drivers/staging/sm750fb/sm750_cursor.c + create mode 100644 drivers/staging/sm750fb/sm750_cursor.h + create mode 100644 drivers/staging/sm750fb/sm750_help.h + create mode 100644 drivers/staging/sm750fb/sm750_hw.c + create mode 100644 drivers/staging/sm750fb/sm750_hw.h + delete mode 100644 drivers/staging/unisys/include/uniklog.h +Merging char-misc/char-misc-next (208d51154c8d checkkconfigsymbols.py: filter reports for tools/) +$ git merge char-misc/char-misc-next +Auto-merging kernel/time/clockevents.c +Auto-merging drivers/misc/mei/pci-me.c +Auto-merging drivers/misc/mei/main.c +Auto-merging drivers/misc/mei/amthif.c +Merge made by the 'recursive' strategy. + arch/x86/include/uapi/asm/hyperv.h | 2 + + drivers/hv/channel.c | 103 +++++--- + drivers/hv/channel_mgmt.c | 180 ++++++++------ + drivers/hv/connection.c | 35 ++- + drivers/hv/hv.c | 34 ++- + drivers/hv/hv_balloon.c | 82 ++++--- + drivers/hv/hv_util.c | 13 +- + drivers/hv/hyperv_vmbus.h | 14 ++ + drivers/hv/vmbus_drv.c | 115 ++++++++- + drivers/misc/mei/Makefile | 3 + + drivers/misc/mei/amthif.c | 398 +++++++++++-------------------- + drivers/misc/mei/bus.c | 99 ++++---- + drivers/misc/mei/client.c | 474 ++++++++++++++++++++++++------------- + drivers/misc/mei/client.h | 24 +- + drivers/misc/mei/debugfs.c | 21 +- + drivers/misc/mei/hbm.c | 8 +- + drivers/misc/mei/hw-me.c | 170 +++++++------ + drivers/misc/mei/hw-me.h | 4 +- + drivers/misc/mei/hw-txe.c | 2 +- + drivers/misc/mei/init.c | 2 +- + drivers/misc/mei/interrupt.c | 171 ++++++------- + drivers/misc/mei/main.c | 105 +++----- + drivers/misc/mei/mei-trace.c | 25 ++ + drivers/misc/mei/mei-trace.h | 76 ++++++ + drivers/misc/mei/mei_dev.h | 40 ++-- + drivers/misc/mei/nfc.c | 43 ++-- + drivers/misc/mei/pci-me.c | 4 +- + drivers/misc/mei/pci-txe.c | 4 +- + drivers/misc/mei/wd.c | 18 +- + include/linux/hyperv.h | 34 +++ + kernel/time/clockevents.c | 2 +- + scripts/checkkconfigsymbols.py | 7 +- + 32 files changed, 1321 insertions(+), 991 deletions(-) + create mode 100644 drivers/misc/mei/mei-trace.c + create mode 100644 drivers/misc/mei/mei-trace.h + mode change 100644 => 100755 scripts/checkkconfigsymbols.py +Merging extcon/extcon-next (34825e511971 extcon: Fix the checkpatch warning) +$ git merge extcon/extcon-next +Auto-merging sound/soc/codecs/arizona.c +Auto-merging include/linux/mfd/arizona/core.h +Auto-merging drivers/extcon/extcon.c +Auto-merging drivers/extcon/extcon-arizona.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/extcon/extcon-usb-gpio.txt | 18 + + drivers/extcon/Kconfig | 17 + + drivers/extcon/Makefile | 4 +- + drivers/extcon/extcon-arizona.c | 49 +- + drivers/extcon/extcon-max14577.c | 5 +- + drivers/extcon/extcon-max77693.c | 37 +- + drivers/extcon/extcon-max77843.c | 881 +++++++++++++++++++++ + drivers/extcon/extcon-max8997.c | 5 +- + drivers/extcon/extcon-rt8973a.c | 6 +- + drivers/extcon/extcon-sm5502.c | 6 +- + drivers/extcon/extcon-usb-gpio.c | 237 ++++++ + drivers/extcon/{extcon-class.c => extcon.c} | 1 + + include/linux/mfd/arizona/core.h | 2 +- + sound/soc/codecs/arizona.c | 4 +- + 14 files changed, 1217 insertions(+), 55 deletions(-) + create mode 100644 Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt + create mode 100644 drivers/extcon/extcon-max77843.c + create mode 100644 drivers/extcon/extcon-usb-gpio.c + rename drivers/extcon/{extcon-class.c => extcon.c} (99%) +Merging kdbus/kdbus (9b12c3a3dc37 kdbus: fix minor typo in the walk-through example) +$ git merge kdbus/kdbus +Recorded preimage for 'Documentation/Makefile' +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/magic.h +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 +Recorded resolution for 'Documentation/Makefile'. +[master 4792e1700681] 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 | 30 + + Documentation/kdbus/kdbus.bus.xml | 360 ++++ + Documentation/kdbus/kdbus.connection.xml | 1252 ++++++++++++ + Documentation/kdbus/kdbus.endpoint.xml | 436 ++++ + Documentation/kdbus/kdbus.fs.xml | 124 ++ + Documentation/kdbus/kdbus.item.xml | 840 ++++++++ + Documentation/kdbus/kdbus.match.xml | 553 +++++ + Documentation/kdbus/kdbus.message.xml | 1277 ++++++++++++ + Documentation/kdbus/kdbus.name.xml | 711 +++++++ + Documentation/kdbus/kdbus.policy.xml | 406 ++++ + Documentation/kdbus/kdbus.pool.xml | 320 +++ + 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 | 12 + + ipc/Makefile | 2 +- + ipc/kdbus/Makefile | 22 + + ipc/kdbus/bus.c | 560 ++++++ + ipc/kdbus/bus.h | 101 + + ipc/kdbus/connection.c | 2215 +++++++++++++++++++++ + 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 | 1164 +++++++++++ + 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 | 259 +++ + ipc/kdbus/reply.h | 68 + + ipc/kdbus/util.c | 201 ++ + ipc/kdbus/util.h | 74 + + samples/Makefile | 3 +- + samples/kdbus/.gitignore | 1 + + samples/kdbus/Makefile | 11 + + samples/kdbus/kdbus-api.h | 114 ++ + samples/kdbus/kdbus-workers.c | 1326 ++++++++++++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/kdbus/.gitignore | 3 + + tools/testing/selftests/kdbus/Makefile | 46 + + 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 + + 96 files changed, 34065 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 (695df2132cfe cpuset: initialize cpuset a bit early) +$ git merge cgroup/for-next +Auto-merging init/main.c +Merge made by the 'recursive' strategy. + init/main.c | 2 +- + kernel/cgroup.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging scsi/for-next (0530c35ca4a3 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/NCR5380.c | 10 +++++----- + drivers/scsi/atari_NCR5380.c | 2 +- + drivers/scsi/atari_scsi.c | 1 - + drivers/scsi/g_NCR5380.c | 8 ++++---- + drivers/scsi/mac_scsi.c | 1 - + drivers/scsi/sun3_scsi.c | 1 - + 6 files changed, 10 insertions(+), 13 deletions(-) +Merging target-updates/for-next (d23dbaaaa454 tcm_qla2xxx: Expose per endpoint dynamic_sessions attribute) +$ git merge target-updates/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 10 ++ + drivers/target/iscsi/iscsi_target_configfs.c | 10 ++ + drivers/target/target_core_file.c | 131 ++++++++------------------- + drivers/target/target_core_transport.c | 24 +++++ + include/target/target_core_fabric.h | 1 + + include/target/target_core_fabric_configfs.h | 5 + + 6 files changed, 86 insertions(+), 95 deletions(-) +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 (9e88200386b4 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/bcm/pinctrl-bcm281xx.c +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/brcm,cygnus-pinmux.txt | 132 ++ + .../pinctrl/marvell,armada-39x-pinctrl.txt | 78 + + .../bindings/pinctrl/nvidia,tegra210-pinmux.txt | 166 ++ + .../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 145 ++ + Documentation/pinctrl.txt | 1 - + drivers/pinctrl/Kconfig | 24 +- + drivers/pinctrl/Makefile | 5 +- + drivers/pinctrl/bcm/Kconfig | 34 + + drivers/pinctrl/bcm/Makefile | 5 + + drivers/pinctrl/{ => bcm}/pinctrl-bcm281xx.c | 4 +- + drivers/pinctrl/{ => bcm}/pinctrl-bcm2835.c | 0 + drivers/pinctrl/bcm/pinctrl-cygnus-mux.c | 1022 ++++++++++ + drivers/pinctrl/freescale/pinctrl-imx.c | 8 +- + drivers/pinctrl/freescale/pinctrl-vf610.c | 2 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 254 ++- + drivers/pinctrl/mediatek/Kconfig | 18 + + drivers/pinctrl/mediatek/Makefile | 6 + + drivers/pinctrl/mediatek/pinctrl-mt8135.c | 376 ++++ + drivers/pinctrl/mediatek/pinctrl-mt8173.c | 455 +++++ + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 1262 ++++++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 229 +++ + drivers/pinctrl/mediatek/pinctrl-mtk-mt8135.h | 2114 ++++++++++++++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-mt8173.h | 1226 ++++++++++++ + drivers/pinctrl/mvebu/Kconfig | 4 + + drivers/pinctrl/mvebu/Makefile | 1 + + drivers/pinctrl/mvebu/pinctrl-armada-39x.c | 432 ++++ + drivers/pinctrl/pinctrl-at91.c | 23 +- + drivers/pinctrl/pinctrl-lantiq.h | 2 +- + drivers/pinctrl/pinctrl-tegra.c | 28 +- + drivers/pinctrl/pinctrl-tegra.h | 3 + + drivers/pinctrl/pinctrl-tegra114.c | 17 +- + drivers/pinctrl/pinctrl-tegra124.c | 32 +- + drivers/pinctrl/pinctrl-tegra20.c | 3 + + drivers/pinctrl/pinctrl-tegra210.c | 1588 +++++++++++++++ + drivers/pinctrl/pinctrl-tegra30.c | 116 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 17 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 153 ++ + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + drivers/pinctrl/sh-pfc/core.c | 28 +- + drivers/pinctrl/sh-pfc/core.h | 5 +- + drivers/pinctrl/sh-pfc/gpio.c | 13 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 25 +- + drivers/pinctrl/sirf/pinctrl-sirf.c | 2 +- + include/dt-bindings/pinctrl/mt65xx.h | 40 + + include/linux/pinctrl/consumer.h | 6 +- + 46 files changed, 9867 insertions(+), 240 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,cygnus-pinmux.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra210-pinmux.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt + create mode 100644 drivers/pinctrl/bcm/Kconfig + create mode 100644 drivers/pinctrl/bcm/Makefile + rename drivers/pinctrl/{ => bcm}/pinctrl-bcm281xx.c (99%) + rename drivers/pinctrl/{ => bcm}/pinctrl-bcm2835.c (100%) + create mode 100644 drivers/pinctrl/bcm/pinctrl-cygnus-mux.c + create mode 100644 drivers/pinctrl/mediatek/Kconfig + create mode 100644 drivers/pinctrl/mediatek/Makefile + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8135.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8173.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-common.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-common.h + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8135.h + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8173.h + create mode 100644 drivers/pinctrl/mvebu/pinctrl-armada-39x.c + create mode 100644 drivers/pinctrl/pinctrl-tegra210.c + create mode 100644 include/dt-bindings/pinctrl/mt65xx.h +Merging vhost/linux-next (1179c21e8917 virtio_blk: fix comment for virtio 1.0) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. +Merging remoteproc/for-next (315491e5d6ee remoteproc: add IOMMU hardware capability flag) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. + drivers/remoteproc/da8xx_remoteproc.c | 1 + + drivers/remoteproc/omap_remoteproc.c | 2 ++ + drivers/remoteproc/remoteproc_core.c | 15 ++------------- + drivers/remoteproc/ste_modem_rproc.c | 1 + + include/linux/remoteproc.h | 2 ++ + 5 files changed, 8 insertions(+), 13 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 (1fb60ea63454 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-altera.txt | 43 +++ + Documentation/devicetree/bindings/gpio/gpio.txt | 30 ++ + .../devicetree/bindings/gpio/mrvl-gpio.txt | 2 +- + Documentation/gpio/consumer.txt | 65 +++- + MAINTAINERS | 6 + + drivers/gpio/Kconfig | 15 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/devres.c | 107 +++++- + drivers/gpio/gpio-altera.c | 374 +++++++++++++++++++++ + drivers/gpio/gpio-max732x.c | 134 +++----- + drivers/gpio/gpio-mb86s7x.c | 5 + + drivers/gpio/gpio-mpc8xxx.c | 2 +- + drivers/gpio/gpio-omap.c | 1 - + drivers/gpio/gpio-pcf857x.c | 134 +++----- + drivers/gpio/gpio-pxa.c | 3 +- + drivers/gpio/gpio-vf610.c | 16 +- + drivers/gpio/gpiolib-acpi.c | 84 +++++ + drivers/gpio/gpiolib-of.c | 111 ++++++ + drivers/gpio/gpiolib.c | 283 ++++++++++++++-- + drivers/gpio/gpiolib.h | 13 + + drivers/input/keyboard/gpio_keys_polled.c | 2 +- + drivers/leds/leds-gpio.c | 2 +- + include/linux/gpio/consumer.h | 77 +++++ + 23 files changed, 1284 insertions(+), 226 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-altera.txt + create mode 100644 drivers/gpio/gpio-altera.c +Merging dma-mapping/dma-mapping-next (04abab698285 include/dma-mapping: Clarify output of dma_map_sg) +$ git merge dma-mapping/dma-mapping-next +Merge made by the 'recursive' strategy. + include/asm-generic/dma-mapping-common.h | 5 +++++ + include/linux/dma-mapping.h | 4 ++++ + 2 files changed, 9 insertions(+) +Merging pwm/for-next (6da89312a39b pwm: samsung: Fix output race on disabling) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/pwm/imx-pwm.txt | 12 ++++++++- + drivers/pwm/pwm-atmel-hlcdc.c | 4 +++ + drivers/pwm/pwm-mxs.c | 8 ++++-- + drivers/pwm/pwm-pca9685.c | 2 +- + drivers/pwm/pwm-samsung.c | 32 ++++++++++++++++++++++- + 5 files changed, 53 insertions(+), 5 deletions(-) +Merging dma-buf/for-next (56a4d3e2e2d4 staging: android: ion: fix wrong init of dma_buf_export_info) +$ git merge dma-buf/for-next +Auto-merging drivers/staging/android/ion/ion.c +Auto-merging drivers/media/v4l2-core/videobuf2-vmalloc.c +Auto-merging drivers/gpu/drm/tegra/gem.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_dmabuf.c +Merge made by the 'recursive' strategy. + Documentation/dma-buf-sharing.txt | 23 +++++++------ + drivers/dma-buf/dma-buf.c | 47 ++++++++++++-------------- + drivers/gpu/drm/armada/armada_gem.c | 10 ++++-- + drivers/gpu/drm/drm_prime.c | 12 ++++--- + drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 9 +++-- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 10 ++++-- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 9 ++++- + drivers/gpu/drm/tegra/gem.c | 10 ++++-- + drivers/gpu/drm/ttm/ttm_object.c | 9 +++-- + drivers/gpu/drm/udl/udl_dmabuf.c | 9 ++++- + drivers/media/v4l2-core/videobuf2-dma-contig.c | 8 ++++- + drivers/media/v4l2-core/videobuf2-dma-sg.c | 8 ++++- + drivers/media/v4l2-core/videobuf2-vmalloc.c | 8 ++++- + drivers/staging/android/ion/ion.c | 9 +++-- + include/linux/dma-buf.h | 34 +++++++++++++++---- + 15 files changed, 152 insertions(+), 63 deletions(-) +Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (5cf065f556cb Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/exynos5433-clock.txt | 462 ++ + drivers/clk/clk-conf.c | 7 +- + drivers/clk/clk-fractional-divider.c | 3 + + drivers/clk/clk.c | 134 +- + drivers/clk/clk.h | 3 - + drivers/clk/clkdev.c | 30 +- + drivers/clk/qcom/clk-rcg.c | 62 + + drivers/clk/qcom/clk-rcg.h | 1 + + drivers/clk/qcom/gcc-ipq806x.c | 2 +- + drivers/clk/qcom/lcc-ipq806x.c | 5 +- + drivers/clk/samsung/Makefile | 1 + + drivers/clk/samsung/clk-exynos-clkout.c | 2 + + drivers/clk/samsung/clk-exynos5433.c | 5423 ++++++++++++++++++++ + include/dt-bindings/clock/exynos5433.h | 1403 +++++ + include/trace/events/clk.h | 198 + + 15 files changed, 7651 insertions(+), 85 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/exynos5433-clock.txt + create mode 100644 drivers/clk/samsung/clk-exynos5433.c + create mode 100644 include/dt-bindings/clock/exynos5433.h + create mode 100644 include/trace/events/clk.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 (32dcfba6f8df selftests: Add install target) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + tools/testing/selftests/Makefile | 33 +++ + tools/testing/selftests/breakpoints/Makefile | 5 +- + tools/testing/selftests/cpu-hotplug/Makefile | 5 +- + tools/testing/selftests/cpu-hotplug/on-off-test.sh | 0 + tools/testing/selftests/efivarfs/Makefile | 6 +- + tools/testing/selftests/efivarfs/efivarfs.sh | 0 + tools/testing/selftests/exec/Makefile | 8 +- + tools/testing/selftests/firmware/Makefile | 20 +- + tools/testing/selftests/firmware/fw_filesystem.sh | 0 + tools/testing/selftests/firmware/fw_userhelper.sh | 0 + tools/testing/selftests/ftrace/Makefile | 5 +- + tools/testing/selftests/ipc/Makefile | 5 +- + tools/testing/selftests/kcmp/Makefile | 5 +- + tools/testing/selftests/lib.mk | 31 ++ + tools/testing/selftests/memfd/Makefile | 6 +- + tools/testing/selftests/memory-hotplug/Makefile | 7 +- + .../selftests/memory-hotplug/on-off-test.sh | 0 + tools/testing/selftests/mount/Makefile | 10 +- + tools/testing/selftests/mqueue/Makefile | 16 +- + tools/testing/selftests/net/Makefile | 9 +- + tools/testing/selftests/net/run_afpackettests | 0 + tools/testing/selftests/net/run_netsocktests | 0 + tools/testing/selftests/ptrace/Makefile | 5 +- + tools/testing/selftests/size/Makefile | 5 +- + tools/testing/selftests/sysctl/Makefile | 12 +- + tools/testing/selftests/sysctl/run_numerictests | 0 + tools/testing/selftests/sysctl/run_stringtests | 0 + tools/testing/selftests/timers/Makefile | 37 ++- + .../testing/selftests/timers/alarmtimer-suspend.c | 185 ++++++++++++ + tools/testing/selftests/timers/change_skew.c | 107 +++++++ + .../testing/selftests/timers/clocksource-switch.c | 179 ++++++++++++ + .../testing/selftests/timers/inconsistency-check.c | 204 +++++++++++++ + tools/testing/selftests/timers/leap-a-day.c | 319 +++++++++++++++++++++ + tools/testing/selftests/timers/leapcrash.c | 120 ++++++++ + tools/testing/selftests/timers/mqueue-lat.c | 124 ++++++++ + tools/testing/selftests/timers/nanosleep.c | 174 +++++++++++ + tools/testing/selftests/timers/nsleep-lat.c | 190 ++++++++++++ + tools/testing/selftests/timers/posix_timers.c | 9 +- + tools/testing/selftests/timers/raw_skew.c | 154 ++++++++++ + tools/testing/selftests/timers/set-2038.c | 144 ++++++++++ + tools/testing/selftests/timers/set-tai.c | 79 +++++ + tools/testing/selftests/timers/set-timer-lat.c | 209 ++++++++++++++ + tools/testing/selftests/timers/skew_consistency.c | 89 ++++++ + tools/testing/selftests/timers/threadtest.c | 200 +++++++++++++ + tools/testing/selftests/timers/valid-adjtimex.c | 202 +++++++++++++ + tools/testing/selftests/user/Makefile | 5 +- + tools/testing/selftests/vm/Makefile | 6 +- + tools/testing/selftests/vm/run_vmtests | 0 + 49 files changed, 2855 insertions(+), 75 deletions(-) + mode change 100644 => 100755 tools/testing/selftests/cpu-hotplug/on-off-test.sh + mode change 100644 => 100755 tools/testing/selftests/efivarfs/efivarfs.sh + mode change 100644 => 100755 tools/testing/selftests/firmware/fw_filesystem.sh + mode change 100644 => 100755 tools/testing/selftests/firmware/fw_userhelper.sh + create mode 100644 tools/testing/selftests/lib.mk + mode change 100644 => 100755 tools/testing/selftests/memory-hotplug/on-off-test.sh + mode change 100644 => 100755 tools/testing/selftests/net/run_afpackettests + mode change 100644 => 100755 tools/testing/selftests/net/run_netsocktests + mode change 100644 => 100755 tools/testing/selftests/sysctl/run_numerictests + mode change 100644 => 100755 tools/testing/selftests/sysctl/run_stringtests + create mode 100644 tools/testing/selftests/timers/alarmtimer-suspend.c + create mode 100644 tools/testing/selftests/timers/change_skew.c + create mode 100644 tools/testing/selftests/timers/clocksource-switch.c + create mode 100644 tools/testing/selftests/timers/inconsistency-check.c + create mode 100644 tools/testing/selftests/timers/leap-a-day.c + create mode 100644 tools/testing/selftests/timers/leapcrash.c + create mode 100644 tools/testing/selftests/timers/mqueue-lat.c + create mode 100644 tools/testing/selftests/timers/nanosleep.c + create mode 100644 tools/testing/selftests/timers/nsleep-lat.c + create mode 100644 tools/testing/selftests/timers/raw_skew.c + create mode 100644 tools/testing/selftests/timers/set-2038.c + create mode 100644 tools/testing/selftests/timers/set-tai.c + create mode 100644 tools/testing/selftests/timers/set-timer-lat.c + create mode 100644 tools/testing/selftests/timers/skew_consistency.c + create mode 100644 tools/testing/selftests/timers/threadtest.c + create mode 100644 tools/testing/selftests/timers/valid-adjtimex.c + mode change 100644 => 100755 tools/testing/selftests/vm/run_vmtests +Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump) +$ git merge y2038/y2038 +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/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 +Merge made by the 'recursive' strategy. + 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 (c5b19946eb76 kernel: Fix sparse warning for ACCESS_ONCE) +$ git merge access_once/linux-next +Already up-to-date. +Merging livepatching/for-next (ebf4ab31f66e Merge branch 'for-4.1/core' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + arch/x86/include/asm/livepatch.h | 4 +-- + include/linux/livepatch.h | 8 ++--- + kernel/livepatch/core.c | 69 ++++++++++------------------------------ + 3 files changed, 23 insertions(+), 58 deletions(-) +Merging akpm-current/current (5c9207e2c9bd x86: switch to using asm-generic for seccomp.h) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'mm/cma.c' +Resolved 'Documentation/printk-formats.txt' using previous resolution. +Resolved 'arch/s390/mm/mmap.c' using previous resolution. +Resolved 'fs/fat/inode.c' using previous resolution. +Resolved 'lib/Makefile' using previous resolution. +Auto-merging mm/vmalloc.c +Auto-merging mm/page_alloc.c +Auto-merging mm/page-writeback.c +Auto-merging mm/mlock.c +Auto-merging mm/memtest.c +Auto-merging mm/memcontrol.c +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging mm/cma.c +CONFLICT (content): Merge conflict in mm/cma.c +Auto-merging mm/Makefile +Removing lib/find_next_bit.c +Auto-merging lib/Makefile +CONFLICT (content): Merge conflict in lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sysctl.c +Auto-merging kernel/cpuset.c +Auto-merging kernel/cgroup.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/linux/fs.h +Auto-merging fs/ocfs2/ocfs2.h +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/locks.c +Auto-merging fs/fat/inode.c +CONFLICT (content): Merge conflict in fs/fat/inode.c +Auto-merging fs/cifs/connect.c +Auto-merging fs/affs/file.c +Auto-merging drivers/rtc/rtc-s3c.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +Auto-merging arch/x86/mm/pgtable.c +Removing arch/x86/include/asm/seccomp_64.h +Removing arch/x86/include/asm/seccomp_32.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/mm/mmap.c +CONFLICT (content): Merge conflict in arch/s390/mm/mmap.c +Auto-merging arch/s390/include/asm/elf.h +Auto-merging arch/s390/Kconfig +Removing arch/powerpc/include/uapi/asm/seccomp.h +Auto-merging arch/powerpc/Kconfig +Removing arch/parisc/include/asm/seccomp.h +Auto-merging arch/parisc/include/asm/pgalloc.h +Auto-merging arch/arm64/include/asm/tlb.h +Auto-merging arch/arm64/Kconfig +Removing arch/arm/include/asm/seccomp.h +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/printk-formats.txt +CONFLICT (content): Merge conflict in Documentation/printk-formats.txt +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'mm/cma.c'. +[master 3f9e32f09a16] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + CREDITS | 13 + + Documentation/ABI/testing/sysfs-block-zram | 15 + + Documentation/ABI/testing/sysfs-class-zram | 24 + + Documentation/blockdev/zram.txt | 27 +- + Documentation/cma/debugfs.txt | 21 + + .../devicetree/bindings/rtc/stmp3xxx-rtc.txt | 5 + + Documentation/filesystems/proc.txt | 15 +- + Documentation/filesystems/vfat.txt | 10 + + Documentation/kernel-parameters.txt | 10 +- + Documentation/printk-formats.txt | 59 +- + Documentation/sysctl/kernel.txt | 62 +- + Documentation/vm/cleancache.txt | 4 +- + Documentation/vm/unevictable-lru.txt | 26 +- + MAINTAINERS | 72 +- + README | 34 +- + arch/Kconfig | 15 + + arch/alpha/Kconfig | 4 + + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/arc/kernel/troubleshoot.c | 3 +- + arch/arm/Kconfig | 7 +- + arch/arm/include/asm/Kbuild | 1 + + arch/arm/include/asm/elf.h | 4 - + arch/arm/include/asm/pgtable-3level.h | 1 + + arch/arm/include/asm/seccomp.h | 11 - + arch/arm/mm/init.c | 3 + + arch/arm/mm/mmap.c | 16 +- + arch/arm/plat-pxa/dma.c | 111 ++- + arch/arm64/Kconfig | 16 +- + arch/arm64/include/asm/elf.h | 5 - + arch/arm64/include/asm/kvm_mmu.h | 4 +- + arch/arm64/include/asm/page.h | 4 +- + arch/arm64/include/asm/pgalloc.h | 8 +- + arch/arm64/include/asm/pgtable-hwdef.h | 6 +- + arch/arm64/include/asm/pgtable-types.h | 12 +- + arch/arm64/include/asm/pgtable.h | 10 +- + arch/arm64/include/asm/tlb.h | 4 +- + arch/arm64/mm/init.c | 2 + + arch/arm64/mm/mmap.c | 20 +- + arch/arm64/mm/mmu.c | 4 +- + arch/cris/arch-v10/kernel/setup.c | 58 +- + arch/cris/arch-v32/kernel/setup.c | 62 +- + arch/ia64/Kconfig | 18 +- + arch/ia64/include/asm/page.h | 4 +- + arch/ia64/include/asm/pgalloc.h | 4 +- + arch/ia64/include/asm/pgtable.h | 12 +- + arch/ia64/kernel/ivt.S | 12 +- + arch/ia64/kernel/machine_kexec.c | 4 +- + arch/m68k/Kconfig | 4 + + arch/microblaze/include/asm/seccomp.h | 8 +- + arch/microblaze/kernel/cpu/mb.c | 149 ++-- + arch/mips/Kconfig | 7 +- + arch/mips/include/asm/elf.h | 4 - + arch/mips/include/asm/seccomp.h | 7 +- + arch/mips/include/uapi/asm/mman.h | 1 + + arch/mips/mm/mmap.c | 24 +- + arch/nios2/kernel/cpuinfo.c | 77 +- + arch/openrisc/kernel/setup.c | 50 +- + arch/parisc/Kconfig | 5 + + arch/parisc/include/asm/Kbuild | 1 + + arch/parisc/include/asm/pgalloc.h | 2 +- + arch/parisc/include/asm/pgtable.h | 16 +- + arch/parisc/include/asm/seccomp.h | 16 - + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/parisc/kernel/entry.S | 4 +- + arch/parisc/kernel/head.S | 4 +- + arch/parisc/mm/init.c | 2 +- + arch/powerpc/Kconfig | 8 +- + arch/powerpc/include/asm/elf.h | 4 - + arch/powerpc/include/asm/pgtable-ppc64.h | 2 + + arch/powerpc/include/asm/seccomp.h | 10 + + arch/powerpc/include/uapi/asm/Kbuild | 1 - + arch/powerpc/include/uapi/asm/seccomp.h | 16 - + arch/powerpc/mm/mmap.c | 28 +- + arch/s390/Kconfig | 7 + + arch/s390/include/asm/elf.h | 12 +- + arch/s390/mm/mmap.c | 32 +- + arch/s390/pci/pci_debug.c | 6 +- + arch/sh/Kconfig | 4 + + arch/sh/kernel/dwarf.c | 18 +- + arch/sparc/Kconfig | 4 + + arch/sparc/include/asm/pgtable_64.h | 9 + + arch/sparc/include/asm/seccomp.h | 11 +- + arch/sparc/kernel/mdesc.c | 22 +- + arch/tile/Kconfig | 5 + + arch/um/Kconfig.um | 5 + + arch/x86/Kconfig | 20 +- + arch/x86/include/asm/e820.h | 8 - + arch/x86/include/asm/elf.h | 3 - + arch/x86/include/asm/page_types.h | 2 + + arch/x86/include/asm/paravirt.h | 8 +- + arch/x86/include/asm/paravirt_types.h | 8 +- + arch/x86/include/asm/pgalloc.h | 8 +- + arch/x86/include/asm/pgtable-2level_types.h | 1 - + arch/x86/include/asm/pgtable-3level_types.h | 2 - + arch/x86/include/asm/pgtable.h | 13 +- + arch/x86/include/asm/pgtable_64_types.h | 1 - + arch/x86/include/asm/pgtable_types.h | 4 +- + arch/x86/include/asm/seccomp.h | 21 +- + arch/x86/include/asm/seccomp_32.h | 11 - + arch/x86/include/asm/seccomp_64.h | 17 - + arch/x86/kernel/cpu/mtrr/if.c | 12 +- + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/paravirt.c | 6 +- + arch/x86/kernel/signal.c | 22 +- + arch/x86/mm/Makefile | 2 - + arch/x86/mm/ioremap.c | 23 +- + arch/x86/mm/mmap.c | 38 +- + arch/x86/mm/pgtable.c | 79 +- + arch/x86/xen/mmu.c | 14 +- + arch/xtensa/include/uapi/asm/mman.h | 1 + + block/genhd.c | 2 +- + drivers/base/memory.c | 21 +- + drivers/base/power/wakeup.c | 16 +- + drivers/block/paride/pg.c | 4 +- + drivers/block/zram/zram_drv.c | 814 ++++++++++------- + drivers/block/zram/zram_drv.h | 7 +- + drivers/char/i8k.c | 16 +- + drivers/infiniband/hw/cxgb4/mem.c | 2 +- + drivers/memstick/core/mspro_block.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 15 +- + drivers/parisc/ccio-dma.c | 54 +- + drivers/parisc/sba_iommu.c | 86 +- + drivers/rtc/Kconfig | 27 + + drivers/rtc/Makefile | 3 + + drivers/rtc/class.c | 24 + + drivers/rtc/hctosys.c | 2 +- + drivers/rtc/interface.c | 13 +- + drivers/rtc/rtc-ab-b5ze-s3.c | 2 +- + drivers/rtc/rtc-abx805.c | 223 +++++ + drivers/rtc/rtc-abx80x.c | 193 ++++ + drivers/rtc/rtc-cmos.c | 36 +- + drivers/rtc/rtc-da9052.c | 97 +- + drivers/rtc/rtc-ds1305.c | 6 +- + drivers/rtc/rtc-ds1685.c | 5 +- + drivers/rtc/rtc-em3027.c | 11 + + drivers/rtc/rtc-hym8563.c | 2 +- + drivers/rtc/rtc-mc13xxx.c | 2 +- + drivers/rtc/rtc-mrst.c | 16 +- + drivers/rtc/rtc-mt6397.c | 352 ++++++++ + drivers/rtc/rtc-pcf8563.c | 7 +- + drivers/rtc/rtc-s3c.c | 163 +--- + drivers/rtc/rtc-stmp3xxx.c | 66 +- + drivers/rtc/rtc-tegra.c | 4 +- + drivers/rtc/rtc-x1205.c | 4 +- + drivers/s390/cio/blacklist.c | 12 +- + drivers/s390/scsi/zfcp_erp.c | 4 +- + drivers/scsi/bfa/bfad.c | 22 +- + drivers/staging/lustre/lustre/Kconfig | 1 + + .../lustre/include/linux/lustre_patchless_compat.h | 4 +- + drivers/watchdog/bcm_kona_wdt.c | 27 +- + drivers/xen/tmem.c | 16 +- + firmware/ihex2fw.c | 1 + + fs/Kconfig.binfmt | 3 - + fs/affs/affs.h | 28 +- + fs/affs/amigaffs.c | 3 +- + fs/affs/file.c | 2 +- + fs/affs/inode.c | 32 +- + fs/affs/namei.c | 6 +- + fs/affs/super.c | 37 +- + fs/binfmt_elf.c | 22 +- + fs/binfmt_misc.c | 30 +- + fs/buffer.c | 4 +- + fs/cifs/connect.c | 6 +- + fs/exec.c | 6 +- + fs/ext4/fsync.c | 5 +- + fs/fat/cache.c | 81 +- + fs/fat/dir.c | 6 +- + fs/fat/fat.h | 11 +- + fs/fat/fatent.c | 3 - + fs/fat/file.c | 65 +- + fs/fat/inode.c | 89 +- + fs/fat/misc.c | 4 - + fs/fat/namei_msdos.c | 2 - + fs/fat/namei_vfat.c | 2 - + fs/hfsplus/catalog.c | 3 +- + fs/hfsplus/ioctl.c | 12 +- + fs/hfsplus/xattr.c | 77 +- + fs/hfsplus/xattr.h | 22 +- + fs/hfsplus/xattr_security.c | 38 +- + fs/hfsplus/xattr_trusted.c | 37 +- + fs/hfsplus/xattr_user.c | 35 +- + fs/hugetlbfs/inode.c | 2 +- + fs/jbd2/journal.c | 11 +- + fs/jbd2/transaction.c | 20 +- + fs/locks.c | 38 + + fs/mpage.c | 23 +- + fs/nfs/Kconfig | 2 +- + fs/nfs/write.c | 5 - + fs/nfsd/Kconfig | 1 + + fs/ocfs2/alloc.c | 64 +- + fs/ocfs2/aops.c | 176 +++- + fs/ocfs2/buffer_head_io.c | 6 + + fs/ocfs2/cluster/heartbeat.c | 49 +- + fs/ocfs2/dir.c | 25 +- + fs/ocfs2/dlm/dlmmaster.c | 23 +- + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/ocfs2/inode.c | 22 +- + fs/ocfs2/localalloc.c | 2 +- + fs/ocfs2/move_extents.c | 3 +- + fs/ocfs2/namei.c | 9 + + fs/ocfs2/ocfs2.h | 2 + + fs/ocfs2/refcounttree.c | 44 +- + fs/ocfs2/slot_map.c | 4 +- + fs/ocfs2/stack_o2cb.c | 2 +- + fs/ocfs2/stack_user.c | 8 +- + fs/ocfs2/suballoc.c | 25 +- + fs/ocfs2/super.c | 61 +- + fs/ocfs2/super.h | 2 +- + fs/ocfs2/xattr.c | 15 +- + fs/posix_acl.c | 46 +- + fs/proc/array.c | 24 +- + fs/proc/base.c | 82 +- + fs/proc/fd.c | 27 +- + fs/super.c | 2 +- + include/asm-generic/pgtable.h | 30 + + include/asm-generic/seccomp.h | 2 + + include/linux/a.out.h | 67 -- + include/linux/bitmap.h | 8 +- + include/linux/bitops.h | 4 +- + include/linux/capability.h | 29 + + include/linux/cleancache.h | 13 +- + include/linux/cma.h | 12 +- + include/linux/crc64_ecma.h | 56 ++ + include/linux/cred.h | 23 +- + include/linux/elf-randomize.h | 22 + + include/linux/fs.h | 8 +- + include/linux/gfp.h | 16 +- + include/linux/huge_mm.h | 4 + + include/linux/io.h | 8 + + include/linux/ioport.h | 8 - + include/linux/kconfig.h | 15 +- + include/linux/kexec.h | 2 + + include/linux/memblock.h | 8 + + include/linux/memory_hotplug.h | 6 + + include/linux/mempool.h | 2 +- + include/linux/migrate.h | 5 - + include/linux/mm.h | 4 +- + include/linux/mm_types.h | 2 + + include/linux/nmi.h | 21 +- + include/linux/oom.h | 3 +- + include/linux/page-flags.h | 2 - + include/linux/printk.h | 5 + + include/linux/rmap.h | 9 +- + include/linux/rtc.h | 4 + + include/linux/string.h | 1 + + include/linux/string_helpers.h | 8 +- + include/linux/types.h | 6 - + include/linux/uidgid.h | 12 + + include/linux/vm_event_item.h | 1 + + include/linux/zsmalloc.h | 1 + + include/trace/events/xen.h | 2 +- + include/uapi/asm-generic/mman-common.h | 1 + + init/Kconfig | 19 +- + init/main.c | 2 + + ipc/msg.c | 34 +- + ipc/sem.c | 26 +- + ipc/shm.c | 42 +- + ipc/util.c | 6 +- + kernel/Makefile | 4 +- + kernel/capability.c | 35 +- + kernel/cgroup.c | 4 +- + kernel/cpuset.c | 18 +- + kernel/cred.c | 3 + + kernel/fork.c | 9 +- + kernel/groups.c | 3 - + kernel/pid.c | 15 +- + kernel/resource.c | 32 - + kernel/sys.c | 2 + + kernel/sys_ni.c | 14 + + kernel/sysctl.c | 35 +- + kernel/trace/trace_stack.c | 4 +- + kernel/watchdog.c | 289 ++++-- + lib/Kconfig | 7 + + lib/Kconfig.debug | 11 + + lib/Makefile | 3 +- + lib/cpumask.c | 9 +- + lib/crc64_ecma.c | 341 +++++++ + lib/find_bit.c | 193 ++++ + lib/find_last_bit.c | 36 +- + lib/find_next_bit.c | 285 ------ + lib/ioremap.c | 53 ++ + lib/lru_cache.c | 9 +- + lib/lz4/lz4_decompress.c | 18 +- + lib/string_helpers.c | 193 ++-- + lib/test-string_helpers.c | 40 +- + lib/vsprintf.c | 374 ++++---- + mm/Kconfig | 6 + + mm/Makefile | 2 + + mm/cleancache.c | 276 ++---- + mm/cma.c | 49 +- + mm/cma.h | 24 + + mm/cma_debug.c | 171 ++++ + mm/compaction.c | 15 +- + mm/filemap.c | 15 +- + mm/gup.c | 124 ++- + mm/huge_memory.c | 75 +- + mm/hugetlb.c | 9 + + mm/internal.h | 4 +- + mm/madvise.c | 150 ++++ + mm/memblock.c | 4 +- + mm/memcontrol.c | 194 ++-- + mm/memory.c | 371 ++++---- + mm/memory_hotplug.c | 46 +- + mm/mempolicy.c | 6 +- + mm/mempool.c | 10 +- + {arch/x86/mm => mm}/memtest.c | 16 +- + mm/migrate.c | 20 - + mm/mlock.c | 131 +-- + mm/mmap.c | 8 +- + mm/oom_kill.c | 9 +- + mm/page-writeback.c | 19 + + mm/page_alloc.c | 247 ++--- + mm/page_isolation.c | 7 +- + mm/pagewalk.c | 9 +- + mm/rmap.c | 53 +- + mm/slab.c | 22 +- + mm/slub.c | 16 +- + mm/truncate.c | 37 +- + mm/util.c | 30 + + mm/vmalloc.c | 8 +- + mm/vmscan.c | 115 ++- + mm/vmstat.c | 1 + + mm/zsmalloc.c | 989 +++++++++++++++------ + net/openvswitch/flow.c | 4 +- + net/sunrpc/Kconfig | 2 + + net/sunrpc/cache.c | 8 +- + scripts/checkpatch.pl | 52 +- + scripts/spelling.txt | 1 + + security/Kconfig | 1 + + 331 files changed, 7437 insertions(+), 4165 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-zram + create mode 100644 Documentation/cma/debugfs.txt + delete mode 100644 arch/arm/include/asm/seccomp.h + delete mode 100644 arch/parisc/include/asm/seccomp.h + create mode 100644 arch/powerpc/include/asm/seccomp.h + delete mode 100644 arch/powerpc/include/uapi/asm/seccomp.h + delete mode 100644 arch/x86/include/asm/seccomp_32.h + delete mode 100644 arch/x86/include/asm/seccomp_64.h + create mode 100644 drivers/rtc/rtc-abx805.c + create mode 100644 drivers/rtc/rtc-abx80x.c + create mode 100644 drivers/rtc/rtc-mt6397.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/linux/elf-randomize.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 lib/find_bit.c + delete mode 100644 lib/find_next_bit.c + create mode 100644 mm/cma.h + create mode 100644 mm/cma_debug.c + rename {arch/x86/mm => mm}/memtest.c (84%) +$ git am -3 ../patches/0001-fs-fat-put-one-actually-necessary-include-file-back.patch +Applying: fs/fat: put one actually necessary include file back +$ 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/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR +Applying: lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text +Applying: mips: ip32: add platform data hooks to use DS1685 driver +Applying: tile/elf: reorganize notify_exec() +Applying: oprofile: reduce mmap_sem hold for mm->exe_file +Applying: powerpc/oprofile: reduce mmap_sem hold for exe_file +Applying: oprofile-reduce-mmap_sem-hold-for-mm-exe_file-fix +Applying: tomoyo: reduce mmap_sem hold for mm->exe_file +Applying: tomoyo-reduce-mmap_sem-hold-for-mm-exe_file-checkpatch-fixes +Applying: MAINTAINERS: add Mediatek SoC mailing list +Applying: drivers/w1/w1_int.c: call put_device if device_register fails +Applying: mm: add strictlimit knob +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 8767c7edad8a...386508942afe akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (386508942afe mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Removing arch/mips/include/asm/mach-ip32/mc146818rtc.h +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 ++ + MAINTAINERS | 1 + + arch/mips/configs/ip32_defconfig | 3 +- + arch/mips/include/asm/mach-ip32/mc146818rtc.h | 36 ------- + arch/mips/sgi-ip32/ip32-platform.c | 52 ++++++++-- + arch/mips/sgi-ip32/ip32-reset.c | 131 ++++++++------------------ + arch/powerpc/oprofile/cell/spu_task_sync.c | 13 ++- + arch/tile/mm/elf.c | 47 +++++---- + arch/unicore32/kernel/fpu-ucf64.c | 4 +- + drivers/oprofile/buffer_sync.c | 30 +++--- + drivers/w1/w1_int.c | 3 +- + kernel/fork.c | 1 + + lib/Kconfig | 5 +- + mm/backing-dev.c | 35 +++++++ + security/tomoyo/util.c | 13 ++- + 15 files changed, 195 insertions(+), 187 deletions(-) + delete mode 100644 arch/mips/include/asm/mach-ip32/mc146818rtc.h diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..5c79a75dfd20 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing jdelvare-hwmon based on 3.19-rc6 +Unchanged quilt series jdelvare-hwmon diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..521ef2600e3e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20150316 |