diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-11-06 19:40:10 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-11-06 19:40:10 +1100 |
| commit | 5579b4b0f01b0e8a04201a7e05773066ef9909ac (patch) | |
| tree | e59c7af1bfd6f7da452333b517ea8c8ff161bcf0 | |
| parent | 0d69b0e1ada955f71e90b6b19c56852eb734352e (diff) | |
Add linux-next specific files for 20141106next-20141106
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 229 | ||||
| -rw-r--r-- | Next/Trees | 231 | ||||
| -rw-r--r-- | Next/merge.log | 5445 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5908 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..4a44a3b1730d --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,229 @@ +Name SHA1 +---- ---- +origin 20f3963d8f48ae8309fbc777ef6787fd0a3f53c2 +fixes b94d525e58dc9638dd3f98094cb468bcfb262039 +kbuild-current 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +arc-current 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd +arm-current 9ff0bb5ba60638a688a46e93df8c5009896672eb +m68k-current f7bbd12a4b7e088f53f20dd31019984459699fb9 +metag-fixes ffe6902b66aaa4ca6694bc19639259c16d84ddb1 +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-merge 396a34340cdf7373c00e3977db27d1a20ea65ebc +powerpc-merge-mpe 8a97577a5967c1234ccc3bc1b45e4b1a58b39ea8 +sparc 7da89a2a3776442a57e918ca0b8678d1b16a7072 +net 66f1c44887ba4f47d617f8ae21cf8e04e1892bd7 +ipsec d10845fc85b2e690b5f6425c5ba4df33a073fbc9 +sound-current 0725dda207e95ff25f1aa01432250323e0ec49d6 +pci-current 32f638fc11db0526c706454d9ab4339d55ac89f3 +wireless 0c9a67c8f1d2b71a89f66349362412e9bf6becab +driver-core.current 0df1f2487d2f0d04703f142813d53615d62a1da4 +tty.current 0df1f2487d2f0d04703f142813d53615d62a1da4 +usb.current f20531a9aae0c7378d9fa75b4b5d99b7eecab066 +usb-gadget-fixes 9599815de61db104ad21bc61f5e3544d2415c6ee +usb-serial-fixes e681286de221af78fc85db9222b6a203148c005a +staging.current bce20b2396626301c65e08306364bce9a7505ae5 +char-misc.current 0df1f2487d2f0d04703f142813d53615d62a1da4 +input-current e55a3366984cda7d179e194a772f5ae4fe551b80 +md-current d47648fcf0611812286f68131b40251c6fa54f5e +crypto-current 09adc8789c4e895d7548fa9eb5d24ad9a5d91c5d +ide 7546e52b5e3d46d0deae4a336252b6dfd52c6571 +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +devicetree-current a87fa1d81a9fb5e9adca9820e16008c40ad09f33 +rr-fixes f49819560f53b7f3a596a8ea2e6764dc86695b62 +vfio-fixes 239a87020b263fe7e70adc5803cb157955023d3c +kselftest-fixes 7069a97a14155349545c73084f9f9f6b6380e0f7 +drm-intel-fixes 0df1f2487d2f0d04703f142813d53615d62a1da4 +asm-generic f3670394c29ff3730638762c1760fd2f624e6d7b +arc 996bad6cb3510d726d435c6802294ac289418608 +arm 9ff0bb5ba60638a688a46e93df8c5009896672eb +arm-perf af66abfe2ec8bd82211e9e4f036a64c902ff4cdb +arm-soc d6d798c1db44885e87f8367b79586399ceada61d +bcm2835 fa389e220254c69ffae0d403eac4146171062d08 +berlin bb3adf0f462700ebe31c0d1864b264c5049bd77e +cortex-m f0d7515372ff0ea53fd66099533d3c8e0464cbbf +ep93xx bfb0709fd17b13498d99592bbe12c91130e35a55 +imx-mxs e173c7d26265a6c00b27179e71ea3d863aa8054d +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +keystone b17275a4a6cc61e0b7da40558ff5c7250fb80917 +msm 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1 +mvebu 0626430385b7d1f8141b76d9c337369c1631d38b +renesas fa8b1f634502e31738cb70b6feb21180d62ba7e1 +samsung 5d184e4fb69a9ca64c4ab75c470fd60a2f466160 +sunxi 2f38ad8b07ac300f4ad3a7ee5add9af56e3bc616 +tegra 5599b91976479fb87ca3c3ade8a518e56c103b44 +arm64 0a6479b0ffad8dd236915e271faaf2cbb4cac287 +blackfin 275f5a8573e7832d0cf344a1b29da357c7038870 +c6x ae72758f1dd93bd367dc7719702f24a9bfb3bad9 +cris 21bd887cd7c485214bbdbf6a52ce9a74ac85c844 +hexagon a9a44fdf329668125042055c569656aa83d8cccb +ia64 0f33be009b89d2268e94194dc4fd01a7851b6d51 +m68k bcf8eb09b564096d47f9740ac16057e5f7c8d0f1 +m68knommu cac7f2429872d3733dc3f9915857b1691da2eb2f +metag f93125ae17d1d259b5aba84016db260903822194 +microblaze a4f174dee4ae842e07cab7eeec194a3e60925c8d +mips 456fbdb023b2bbc74e55a4b58adcb176d5efa51e +openrisc 548dafe880ad84d0accc0a5596c26e3348b103e1 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd 5e40d331bd72447197f26525f21711c4a265b6a6 +powerpc 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +powerpc-mpe 8a97577a5967c1234ccc3bc1b45e4b1a58b39ea8 +fsl cb0446c1b625326682ec4f9d1dd10779433646bc +mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +s390 eaf785d51dc6782da4cc87b5e891c8a9f8fa2c27 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 01f7ae056916b4e75ccaa48b9daacb9806caf4aa +uml 989e59fa41c5464ab77bf0bf82f32f721430544e +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 66acb0216d5ae1f29fe76c5a192547664c5c0159 +btrfs a43bb39b5c710e79e921fb76341bacc418cfde78 +ceph c27a3e4d667fdcad3db7b104f75659478e0c68d8 +cifs 6212096bb0a1421a4c26a6e31e34ad7e7f559600 +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 831115af5ca36d713355bf1b379081691eca8b3f +ext3 3c9cafe05ff002eb84d438a02f3c8d468720463b +ext4 ae9e9c6aeea6f91ccb4fb369d7dd8f1a8b5f6a58 +f2fs d5053a34a9cc797b9d5d77574354b5555848c43c +fscache 1a8ed18fb7db48c916c2ccd484e04bd4dd737834 +fuse d7afaec0b564f0609e116f562983b8e72fc3e9c9 +gfs2 1a8550332a7f0111306b6b34e44a7c696ef68c4d +jfs bb5e50aaa80564268f950d1b2f764455afbfea82 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs 6debb30deb5ea81cd57c0ac742d4ff374bc6f64a +nfsd ccc6398ea5d58fdedc6caccba0216ab30739773b +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 6d565409503f4e1f74ac30de14e8c91a2b826cd8 +v9fs f15844e0777fec936f87a87f97394f83911dacd3 +ubifs 91401a34038e614076dbfb5c4969a052e72fb296 +xfs 5d11fb4b9a1d90983452c029b5e1377af78fda49 +file-locks 1b2b32dcdb3df28dd103033c73cac2417fa05845 +vfs 9c883c360fd0502271edadb3e1e476f53ffe1253 +pci f114040e3ea6e07372334ade75d1ee0775c355e1 +hid 351da0b20a0a39bafbfd677759d0c96cc9e6e4e0 +i2c f114040e3ea6e07372334ade75d1ee0775c355e1 +jdelvare-hwmon ae530d4403e9a22363c275a82b46ecd95f939a04 +hwmon-staging efe8271c1e1b2cd41ab6c4a163bfbd83309e82f9 +v4l-dvb 0da19d032fb1a3185ee00cab87236ae3656afb3e +kbuild e9f717fb534c1cfc167cbbc04bcde24699921e3b +kconfig 95edca5c523c4b404dd60baa0a1bea0e4c38fd72 +libata f9ca5ab832e7ac5bc2b6fe0e82ad46d536f436f9 +pm f23b3d72491bf55485e177ad379965ae3babdb67 +idle e7c95ff32d0075736cbdd8d38d954fb4ed6ced9b +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal 6ceaf58abe25e86292152005c51169796bad3407 +thermal-soc 9404b15775ec31344af57ef5696879686b5f702d +ieee1394 19583ca584d6f574384e17fe7613dfaeadcdc4a6 +dlm c07127b48c6367255fb4506e6d6ba6e219205607 +swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8 +slave-dma f114040e3ea6e07372334ade75d1ee0775c355e1 +net-next 25de4668d094f00e44a8f2428dd3c1a4ecfa0053 +ipsec-next f293a5e33e084ef84b802e3002e5fe3eef086171 +wireless-next bf515fb11ab539c76d04f0e3c5216ed41f41d81f +bluetooth 0916c02205ed76c03863b401e60fa105c4008cfa +infiniband 7b909bb49ac204bfd2e628707db37beb490dbc5c +mtd 89cf38dd536a7301d6b5f5ddd73f42074c01bfaa +l2-mtd abb1cd00e6b7434e866f1f817b4994e1c7f1f16d +crypto bac68f2c9a43e60a70e27c0c75aaca7128b6271d +drm 041df3573d0ce74b7f2f505c4224c8ee9be14a7c +drm-panel 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +drm-intel b5bdca7dade990d8bc5e3e9fa3376c4e0307cc92 +drm-tegra 8ed05f4854985350bc90df4d04a95d3fee658849 +drm-misc babc94936b7a48f0411c85a63074c0e378b55761 +sound 19566b0bd93c34e4941822ed3c0d76a5abddcf82 +sound-asoc 3333c009c30c5c20369f5d7cf958a7a2618cdba9 +modules d3051b489aa81ca9ba62af366149ef42b8dae97c +virtio 1bbc26062754b012656d34103215f7552e02b999 +input 02b6a58b83b2f3d97addaf96ef60ad6596bf715f +input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +block 0f6ea1801d84bc9028dd7f9ba65473201d03eec7 +device-mapper f8cc4537dae7a82ae8dc3ffc494a70da0cda0cdc +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh 71884933b5743d2676554234bb3a9b6d989f7932 +kgdb 662bfa325be19ac98af0bc6b31fe142f09033301 +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md b395f75eabb3844c99244928293796ff42feaa3d +mfd 4a288f1edf333a260622cea8346e38b48525bf92 +backlight 0df1f2487d2f0d04703f142813d53615d62a1da4 +battery cdaf3e15385d3232b52287e50692506f8fd01a09 +fbdev 718b90ac4c21c81f42b6db062ca0867f3cac7648 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 f114040e3ea6e07372334ade75d1ee0775c355e1 +regulator 5386984c6ba168d4c534e211d35e6bc2a8c34e9c +security 594081ee7145cc30a3977cb4e218f81213b63dc5 +integrity c2426d2ad5027397342107b7ff094aa9b234acb8 +selinux 4093a8443941d7021c7f747474a87a56cf666270 +lblnet d8ec26d7f8287f5788a494f56e8814210f0e64be +watchdog 8ae1a57f54af4686c75623ed15a2429d020ffd65 +iommu 5988c921b7477ed17e9193e49f4931570ec54725 +dwmw2-iommu 1860e379875dfe7271c649058aeddffe5afd9d0d +vfio 93899a679fd6b2534b5c297d9316bae039ebcbe1 +osd 1fa3a002b2546c42c343c77c144871285896ced5 +jc_docs 4041f42fa17b5aaa358a5bdb7458977c90795169 +trivial be278e980d95f52b280cefac1a98b87fa518dd29 +audit 915f389d9c52c5a2d6946ffc252d68bfd6c5dfee +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree 43c0767e17ac70e494b6a381b3a20be6a1a75c70 +dt-rh d22e9131187df5c220d435b02e7bf346202c00a8 +mailbox 9f3e3cacb2ffdefe28c7cf490bf543e4dcb2770a +spi 024b58aeba172a80bcfa278057952dc11319a519 +tip bb7c44a44b5886e4d7f83ba8548b451119f719b8 +clockevents b0ad5917960ca80f96baeb427ec64a12c57f0c36 +edac d0585cd815faef50ce3d12cbe173438eb4d81eb8 +edac-amd bc4febe93c2fd7d0e74dad773bad2ed0237780ee +irqchip 8fbe8bc2d89beb19819de521db9d2dfb0f99a3b9 +tiny d45461ff03ad6ca6e15c0508d40355868a7390b6 +ftrace 70c738a644787bd01b8a7957759044a10d2f05a4 +rcu f120000b06ab675fd33e7438883e755a553e2590 +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm c6338ce494456ed9c92ef10f63c0a8408bfeac6d +kvm-arm f62c95fd4041d669159dd76ac0bb2a7f86b5b05d +kvm-ppc 8d0eff6385640a9e6eed0b0c09113794b2bb74e9 +oprofile 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip 63401a5dca183ed3d2bd47e04069a6e4fbbbedef +percpu 56e4dea81a55c338eede625f715c7fa21f1a28c4 +workqueues e09c2c295468476a239d13324ce9042ec4de05eb +drivers-x86 725c7f619e20f5051bba627fca11dc107c2a93b1 +chrome-platform 5502486a2077e4280c618b82e8a77ed35932956f +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 46f6c620e8a1b827c29166acbeec162d4a5d69f1 +hsi a26a42508157bc9fda89e3b1d64e47b9e4b55c30 +leds 33faa112cef4ee0395f5484e8feb796876b2cf37 +ipmi ef4a48c513211d842c55e84f7a1c31884b91dcf7 +driver-core 0df1f2487d2f0d04703f142813d53615d62a1da4 +tty 0df1f2487d2f0d04703f142813d53615d62a1da4 +usb d9c3ae28bd6b72803e266eb384e0ba312f9ff837 +usb-gadget c3761a79c14da73edfaaffb6bf24a87535bf20a8 +usb-serial 679315e5fae1e4614eed0d9aa26999ddcb6a0f77 +staging be61a0d78449f53519905640ac3a9f24c197cbaf +char-misc d512c2098b1af6069e47ca457d7034d7cc82d420 +cgroup cea74465e27b1306a237087fca2f5f0befcf1daf +scsi 6a5411d8719c644ef0896940a0d310688687231b +target-updates cac7f2429872d3733dc3f9915857b1691da2eb2f +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +writeback f9b0e058cbd04ada76b13afffa7e1df830543c24 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl 3cbfc571a0e50a54398f139bc6dbacb30a3873ec +vhost 970379f59d81edf78a319f9cdc1234730bcbe6b2 +remoteproc 9a3c4145af32125c5ee39c0272662b47307a8323 +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +gpio 2071d0968e564b4b4a11d36dc58de6e57188edd4 +dma-mapping dda02fd6278d9e995850b3c1dba484f17cbe4de4 +pwm e2e08970100db03bb84fd4a72f9c35bfc18d595a +dma-buf 101e31050bf174e5bcca72bdb9d0bd392aa4f966 +userns a1998908ba46526ac5cbbb9aae610cb234bd9f33 +ktest d832d743385dd5e735660951aa9d7d36a6a4176a +signal 20b4fb485227404329e41ad15588afad3df23050 +clk 98d147f50eb0ce4328e013f5f2c076896003c761 +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +aio 668044a5d632e979ae3cf850f269f8dbbcb3c396 +llvmlinux ec25a590c29cc86541e7919fbfb008203497f89f +documentation 0415447aa3b4decc2c05dfc45a0aa34a5eb4fc54 +kselftest 49296470830aa12027f4aa43ec54f19375be095b +y2038 45446a99cef65aba81c0e59279f100bdb5624acd +akpm-current f87854f250cbdb22b1cd5022318fcc8f2ef03928 +akpm c6ebbf6333fe5641a2ca3793d140a3cad2fcf968 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..3af96045061e --- /dev/null +++ b/Next/Trees @@ -0,0 +1,231 @@ +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 git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.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 +md-current git git://neil.brown.name/md#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 +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.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/swarren/linux-rpi.git#for-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next +mvebu git git://git.infradead.org/linux-mvebu.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 +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/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 +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-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/steve/gfs2-3.0-nmw.git#master +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +logfs git git://github.com/prasad-joshi/logfs_upstream.git#master +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 +omfs git git://github.com/bcopeland/omfs.git#for-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 +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +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-next git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-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/core-stuff +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 +input-mt git git://github.com/rydberg/linux.git#for-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 +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-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 +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git#for-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +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 +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-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 +uprobes git git://github.com/srikard/linux.git#for-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 +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +fw-nohz git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#nohz/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 +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master +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 +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 +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +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 +signal git git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next +clk git git://git.linaro.org/people/mturquette/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +lzo-update git git://github.com/markus-oberhumer/linux.git#lzo-update +aio git git://git.kvack.org/~bcrl/aio-next.git#master +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +documentation git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc.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 +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..1eaeb881bafb --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5445 @@ +$ date +Thursday 6 November 09:56:23 AEDT 2014 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at a1cff6e25e6e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal +Merging origin/master (20f3963d8f48 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge origin/master +Updating a1cff6e25e6e..20f3963d8f48 +Fast-forward + arch/s390/configs/default_defconfig | 36 +++++++++++++-------------------- + arch/s390/configs/gcov_defconfig | 25 +++++------------------ + arch/s390/configs/performance_defconfig | 30 +++++++++------------------ + arch/s390/configs/zfcpdump_defconfig | 10 ++------- + arch/s390/defconfig | 5 ++--- + arch/s390/kernel/ftrace.c | 2 ++ + arch/s390/kernel/vdso32/clock_gettime.S | 12 +++++++---- + arch/s390/kernel/vdso32/gettimeofday.S | 14 +++++++------ + arch/s390/kernel/vdso64/clock_gettime.S | 13 ++++++++---- + arch/s390/kernel/vdso64/gettimeofday.S | 6 ++++-- + arch/s390/kernel/vtime.c | 4 ++++ + fs/overlayfs/readdir.c | 2 +- + 12 files changed, 68 insertions(+), 91 deletions(-) +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 (7d1311b93e58 Linux 3.17-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 (9ff0bb5ba606 ARM: 8180/1: mm: implement no-highmem fast path in kmap_atomic_pfn()) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (f7bbd12a4b7e m68k: Wire up bpf) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) +$ 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 (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging powerpc-merge-mpe/fixes (8a97577a5967 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (7da89a2a3776 sparc64: Fix crashes in schizo_pcierr_intr_other().) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/kernel/pci_schizo.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging net/master (66f1c44887ba bridge: include in6.h in if_bridge.h for struct in6_addr) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/ip-sysctl.txt | 14 +++++ + arch/arm64/boot/dts/apm-storm.dtsi | 10 ++-- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 18 ++++++- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 4 ++ + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 11 ++-- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 5 +- + drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 7 ++- + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 7 ++- + drivers/net/ethernet/broadcom/bcmsysport.c | 13 ++++- + drivers/net/ethernet/freescale/fec_main.c | 16 +++--- + drivers/net/ethernet/marvell/mvpp2.c | 27 ++++++---- + drivers/net/ethernet/sfc/ef10.c | 3 +- + drivers/net/ethernet/smsc/smc91x.c | 20 +++++--- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 52 ++++++++++--------- + drivers/net/ethernet/sun/sunhme.c | 62 +++++++++++++++++++++-- + drivers/net/macvtap.c | 2 + + drivers/net/tun.c | 28 ++++++---- + include/linux/socket.h | 2 +- + include/uapi/linux/Kbuild | 4 ++ + include/uapi/linux/if_bridge.h | 1 + + net/bridge/netfilter/nft_reject_bridge.c | 1 + + net/ipv4/geneve.c | 3 ++ + net/ipv4/tcp_input.c | 60 +++++++++++----------- + net/ipv6/ip6_gre.c | 5 +- + net/ipv6/ip6_tunnel.c | 10 +--- + net/ipv6/ip6_vti.c | 11 +--- + net/ipv6/sit.c | 15 +++--- + 27 files changed, 271 insertions(+), 140 deletions(-) +Merging ipsec/master (d10845fc85b2 Merge branch 'gso_encap_fixes') +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (0725dda207e9 ALSA: usb-audio: Fix device_del() sysfs warnings at disconnect) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 82 ++++++++++++++++++++++++++----------------- + sound/usb/card.c | 9 +++-- + 2 files changed, 57 insertions(+), 34 deletions(-) +Merging pci-current/for-linus (32f638fc11db PCI: Don't oops on virtual buses in acpi_pci_get_bridge_handle()) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + include/linux/pci-acpi.h | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging wireless/master (0c9a67c8f1d2 Merge tag 'mac80211-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) +$ git merge wireless/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/iwlwifi/mvm/fw.c | 10 +++++++++- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 1 + + drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 + + drivers/net/wireless/iwlwifi/mvm/ops.c | 12 +++++++++++- + drivers/net/wireless/iwlwifi/pcie/trans.c | 4 ++-- + drivers/net/wireless/mac80211_hwsim.c | 4 +++- + net/mac80211/ibss.c | 2 +- + net/mac80211/ieee80211_i.h | 3 +-- + net/mac80211/iface.c | 18 ++++++++++++------ + net/mac80211/mesh.c | 2 +- + net/mac80211/mlme.c | 5 +++-- + net/mac80211/rx.c | 14 +++++++------- + net/mac80211/spectmgmt.c | 18 ++++++------------ + 13 files changed, 58 insertions(+), 36 deletions(-) +Merging driver-core.current/driver-core-linus (0df1f2487d2f Linux 3.18-rc3) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (0df1f2487d2f Linux 3.18-rc3) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (f20531a9aae0 phy: omap-usb2: Enable runtime PM of omap-usb2 phy properly) +$ git merge usb.current/usb-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 ----- + drivers/phy/phy-omap-usb2.c | 6 ++++-- + drivers/usb/class/cdc-acm.c | 11 +++++++++-- + drivers/usb/core/hcd.c | 2 ++ + drivers/usb/core/hub.c | 10 +++++----- + drivers/usb/core/quirks.c | 6 ++++++ + drivers/usb/host/Kconfig | 4 ++-- + drivers/usb/host/hwa-hc.c | 2 +- + drivers/usb/host/xhci-pci.c | 18 ++++-------------- + drivers/usb/storage/initializers.c | 4 ++-- + drivers/usb/storage/realtek_cr.c | 2 ++ + drivers/usb/storage/transport.c | 26 ++++++++++++++++++++++++++ + drivers/usb/storage/unusual_uas.h | 28 ++++++++++++++++++++++++++++ + 13 files changed, 91 insertions(+), 33 deletions(-) +Merging usb-gadget-fixes/fixes (9599815de61d usb: dwc2: gadget: fix enumeration issues) +$ git merge usb-gadget-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/usb/dwc2/gadget.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging usb-serial-fixes/usb-linus (e681286de221 USB: opticon: fix non-atomic allocation in write path) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/kobil_sct.c | 5 +++-- + drivers/usb/serial/opticon.c | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging staging.current/staging-linus (bce20b239662 Merge tag 'iio-fixes-for-3.18b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/accel/kxcjk-1013.c | 2 +- + drivers/iio/light/tsl4531.c | 7 ++-- + drivers/iio/proximity/as3935.c | 2 +- + drivers/staging/iio/meter/ade7758.h | 1 - + drivers/staging/iio/meter/ade7758_core.c | 57 ++++++-------------------------- + drivers/staging/iio/meter/ade7758_ring.c | 5 ++- + 6 files changed, 20 insertions(+), 54 deletions(-) +Merging char-misc.current/char-misc-linus (0df1f2487d2f Linux 3.18-rc3) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (e55a3366984c Revert "Input: i8042 - disable active multiplexing by default") +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) +$ git merge md-current/for-linus +Already up-to-date. +Merging crypto-current/master (09adc8789c4e crypto: qat - Enforce valid numa configuration) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + drivers/crypto/qat/qat_common/adf_accel_devices.h | 3 +-- + drivers/crypto/qat/qat_common/adf_transport.c | 12 +++++---- + drivers/crypto/qat/qat_common/qat_algs.c | 7 +++-- + drivers/crypto/qat/qat_common/qat_crypto.c | 8 +++--- + drivers/crypto/qat/qat_dh895xcc/adf_admin.c | 2 +- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 32 +++++++++-------------- + drivers/crypto/qat/qat_dh895xcc/adf_isr.c | 2 +- + 7 files changed, 32 insertions(+), 34 deletions(-) +Merging ide/master (7546e52b5e3d Drivers: ide: Remove typedef atiixp_ide_timing) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (a87fa1d81a9f of: Fix overflow bug in string property parsing functions) +$ git merge devicetree-current/devicetree/merge +Merge made by the 'recursive' strategy. + drivers/of/base.c | 88 ++++++++--------------------- + drivers/of/selftest.c | 66 ++++++++++++++++++++-- + drivers/of/testcase-data/tests-phandle.dtsi | 2 + + include/linux/of.h | 84 ++++++++++++++++++++++----- + 4 files changed, 154 insertions(+), 86 deletions(-) +Merging rr-fixes/fixes (f49819560f53 virtio-rng: skip reading when we start to remove the device) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (7069a97a1415 selftests/net: move test out of Makefile into a shell script) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/net/Makefile | 8 +------- + tools/testing/selftests/net/test_bpf.sh | 10 ++++++++++ + 2 files changed, 11 insertions(+), 7 deletions(-) + create mode 100755 tools/testing/selftests/net/test_bpf.sh +Merging drm-intel-fixes/for-linux-next-fixes (0df1f2487d2f Linux 3.18-rc3) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (f3670394c29f Revert "x86/efi: Fixup GOT in all boot code paths") +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (996bad6cb351 ARC: add power management options) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging arm/for-next (9ff0bb5ba606 ARM: 8180/1: mm: implement no-highmem fast path in kmap_atomic_pfn()) +$ git merge arm/for-next +Already up-to-date. +Merging arm-perf/for-next/perf (af66abfe2ec8 arm: perf: fold hotplug notifier into arm_pmu) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + arch/arm/include/asm/perf_event.h | 2 +- + arch/arm/include/asm/pmu.h | 36 ++- + arch/arm/kernel/Makefile | 2 +- + arch/arm/kernel/perf_callchain.c | 136 +++++++++ + arch/arm/kernel/perf_event.c | 162 ++--------- + arch/arm/kernel/perf_event_cpu.c | 181 ++++++------ + arch/arm/kernel/perf_event_v6.c | 12 +- + arch/arm/kernel/perf_event_v7.c | 72 +++-- + arch/arm/kernel/perf_event_xscale.c | 20 +- + drivers/bus/arm-cci.c | 552 +++++++++++++++++++++++++++++------- + 10 files changed, 772 insertions(+), 403 deletions(-) + create mode 100644 arch/arm/kernel/perf_callchain.c +Merging arm-soc/for-next (d6d798c1db44 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Removing arch/arm/mach-integrator/include/mach/uncompress.h +Removing arch/arm/mach-exynos/hotplug.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/arm-boards | 65 ++ + Documentation/devicetree/bindings/arm/gic.txt | 1 + + .../devicetree/bindings/timer/renesas,mtu2.txt | 2 +- + .../devicetree/bindings/timer/renesas,tmu.txt | 4 +- + MAINTAINERS | 3 +- + arch/arm/Kconfig | 18 - + arch/arm/Kconfig.debug | 16 +- + arch/arm/Makefile | 8 +- + arch/arm/arm-soc-for-next-contents.txt | 46 ++ + arch/arm/boot/dts/Makefile | 30 +- + arch/arm/boot/dts/arm-realview-pb1176.dts | 412 ++++++++++ + arch/arm/boot/dts/emev2-kzm9d.dts | 63 +- + arch/arm/boot/dts/emev2.dtsi | 12 +- + arch/arm/boot/dts/exynos3250.dtsi | 10 + + arch/arm/boot/dts/exynos4210.dtsi | 17 + + arch/arm/boot/dts/exynos4212.dtsi | 17 + + arch/arm/boot/dts/exynos4412-trats2.dts | 352 +++++++- + arch/arm/boot/dts/exynos4412.dtsi | 29 + + arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 16 + + arch/arm/boot/dts/exynos5250-arndale.dts | 907 ++++++++++----------- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 618 +++++++------- + arch/arm/boot/dts/exynos5250-snow.dts | 266 +++--- + arch/arm/boot/dts/exynos5250-spring.dts | 536 ++++++++++++ + arch/arm/boot/dts/exynos5250.dtsi | 16 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 7 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 7 +- + arch/arm/boot/dts/r7s72100-genmai.dts | 3 +- + arch/arm/boot/dts/r7s72100.dtsi | 202 ++--- + arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 7 +- + arch/arm/boot/dts/r8a73a4.dtsi | 243 +++--- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 1 + + arch/arm/boot/dts/r8a7778-bockw-reference.dts | 3 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 1 + + arch/arm/boot/dts/r8a7790-lager.dts | 1 + + arch/arm/boot/dts/r8a7791-henninger.dts | 1 + + arch/arm/boot/dts/r8a7791-koelsch.dts | 1 + + arch/arm/boot/dts/r8a7794-alt.dts | 1 + + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 4 + + arch/arm/boot/dts/rk3066a.dtsi | 93 ++- + arch/arm/boot/dts/rk3188-radxarock.dts | 6 +- + arch/arm/boot/dts/rk3188.dtsi | 41 +- + arch/arm/boot/dts/rk3288-evb-rk808.dts | 6 +- + arch/arm/boot/dts/rk3288.dtsi | 35 +- + arch/arm/boot/dts/rk3xxx.dtsi | 4 + + arch/arm/boot/dts/s3c6410-mini6410.dts | 4 - + arch/arm/boot/dts/s3c64xx.dtsi | 1 - + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 1 + + arch/arm/boot/dts/vf610-cosmic.dts | 19 + + arch/arm/configs/imx_v4_v5_defconfig | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm/configs/integrator_defconfig | 3 + + arch/arm/mach-bcm/Kconfig | 3 - + arch/arm/mach-bcm/Makefile | 2 + + arch/arm/mach-bcm/brcmstb.h | 19 + + arch/arm/mach-bcm/headsmp-brcmstb.S | 33 + + arch/arm/mach-bcm/platsmp-brcmstb.c | 329 ++++++++ + arch/arm/mach-exynos/Makefile | 3 - + arch/arm/mach-exynos/common.h | 2 - + arch/arm/mach-exynos/hotplug.c | 91 --- + arch/arm/mach-exynos/platsmp.c | 113 +++ + arch/arm/mach-exynos/regs-pmu.h | 3 + + arch/arm/mach-imx/clk-vf610.c | 134 ++- + arch/arm/mach-integrator/Kconfig | 18 + + arch/arm/mach-integrator/include/mach/uncompress.h | 48 -- + arch/arm/mach-realview/Kconfig | 13 + + arch/arm/mach-realview/Makefile | 1 + + arch/arm/mach-realview/realview-dt.c | 32 + + arch/arm/mach-rockchip/rockchip.c | 7 + + arch/arm/mach-shmobile/Kconfig | 1 - + arch/arm/mach-shmobile/board-ape6evm-reference.c | 5 - + arch/arm/mach-shmobile/board-ape6evm.c | 4 - + arch/arm/mach-shmobile/board-armadillo800eva.c | 45 +- + arch/arm/mach-shmobile/board-bockw-reference.c | 4 - + arch/arm/mach-shmobile/board-bockw.c | 4 - + arch/arm/mach-shmobile/board-koelsch-reference.c | 4 - + arch/arm/mach-shmobile/board-koelsch.c | 4 - + arch/arm/mach-shmobile/board-kzm9g-reference.c | 4 - + arch/arm/mach-shmobile/board-kzm9g.c | 4 - + arch/arm/mach-shmobile/board-lager-reference.c | 4 - + arch/arm/mach-shmobile/board-lager.c | 4 - + arch/arm/mach-shmobile/board-mackerel.c | 4 - + arch/arm/mach-shmobile/board-marzen-reference.c | 4 - + arch/arm/mach-shmobile/board-marzen.c | 4 - + arch/arm/mach-shmobile/clock-r8a73a4.c | 4 - + arch/arm/mach-shmobile/clock-r8a7740.c | 4 - + arch/arm/mach-shmobile/clock-r8a7778.c | 4 - + arch/arm/mach-shmobile/clock-r8a7779.c | 4 - + arch/arm/mach-shmobile/clock-r8a7790.c | 4 - + arch/arm/mach-shmobile/clock-r8a7791.c | 4 - + arch/arm/mach-shmobile/clock-sh7372.c | 4 - + arch/arm/mach-shmobile/clock-sh73a0.c | 4 - + arch/arm/mach-shmobile/clock.c | 4 - + arch/arm/mach-shmobile/console.c | 4 - + arch/arm/mach-shmobile/headsmp-scu.S | 5 - + arch/arm/mach-shmobile/intc-sh7372.c | 4 - + arch/arm/mach-shmobile/intc-sh73a0.c | 4 - + arch/arm/mach-shmobile/r8a73a4.h | 1 - + arch/arm/mach-shmobile/r8a7740.h | 4 - + arch/arm/mach-shmobile/r8a7778.h | 5 - + arch/arm/mach-shmobile/setup-emev2.c | 4 - + arch/arm/mach-shmobile/setup-r7s72100.c | 4 - + arch/arm/mach-shmobile/setup-r8a73a4.c | 13 +- + arch/arm/mach-shmobile/setup-r8a7740.c | 4 - + arch/arm/mach-shmobile/setup-r8a7778.c | 11 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 4 - + arch/arm/mach-shmobile/setup-r8a7790.c | 4 - + arch/arm/mach-shmobile/setup-r8a7791.c | 4 - + arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 - + arch/arm/mach-shmobile/setup-sh7372.c | 4 - + arch/arm/mach-shmobile/setup-sh73a0.c | 13 +- + arch/arm/mach-shmobile/sh73a0.h | 1 - + arch/arm/mach-shmobile/sleep-sh7372.S | 5 - + arch/arm/mach-shmobile/smp-emev2.c | 4 - + arch/arm/mach-shmobile/smp-r8a7779.c | 4 - + arch/arm/mach-shmobile/smp-sh73a0.c | 4 - + arch/arm/mach-shmobile/timer.c | 5 - + arch/arm64/Makefile | 10 +- + arch/arm64/boot/dts/Makefile | 15 +- + arch/arm64/boot/dts/apm/Makefile | 5 + + arch/arm64/boot/dts/{ => apm}/apm-mustang.dts | 0 + arch/arm64/boot/dts/{ => apm}/apm-storm.dtsi | 0 + arch/arm64/boot/dts/arm/Makefile | 6 + + arch/arm64/boot/dts/{ => arm}/foundation-v8.dts | 0 + arch/arm64/boot/dts/{ => arm}/rtsm_ve-aemv8a.dts | 0 + .../boot/dts/{ => arm}/rtsm_ve-motherboard.dtsi | 0 + arch/arm64/boot/dts/cavium/Makefile | 5 + + arch/arm64/boot/dts/{ => cavium}/thunder-88xx.dts | 0 + arch/arm64/boot/dts/{ => cavium}/thunder-88xx.dtsi | 0 + drivers/bus/brcmstb_gisb.c | 45 +- + drivers/irqchip/irq-gic.c | 2 + + include/dt-bindings/clock/vf610-clock.h | 39 +- + scripts/Kbuild.include | 6 + + scripts/Makefile.dtbinst | 51 ++ + scripts/Makefile.lib | 12 - + 134 files changed, 3789 insertions(+), 1673 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/arm-realview-pb1176.dts + create mode 100644 arch/arm/boot/dts/exynos5250-spring.dts + create mode 100644 arch/arm/mach-bcm/brcmstb.h + create mode 100644 arch/arm/mach-bcm/headsmp-brcmstb.S + create mode 100644 arch/arm/mach-bcm/platsmp-brcmstb.c + delete mode 100644 arch/arm/mach-exynos/hotplug.c + delete mode 100644 arch/arm/mach-integrator/include/mach/uncompress.h + create mode 100644 arch/arm/mach-realview/realview-dt.c + create mode 100644 arch/arm64/boot/dts/apm/Makefile + rename arch/arm64/boot/dts/{ => apm}/apm-mustang.dts (100%) + rename arch/arm64/boot/dts/{ => apm}/apm-storm.dtsi (100%) + create mode 100644 arch/arm64/boot/dts/arm/Makefile + rename arch/arm64/boot/dts/{ => arm}/foundation-v8.dts (100%) + rename arch/arm64/boot/dts/{ => arm}/rtsm_ve-aemv8a.dts (100%) + rename arch/arm64/boot/dts/{ => arm}/rtsm_ve-motherboard.dtsi (100%) + create mode 100644 arch/arm64/boot/dts/cavium/Makefile + rename arch/arm64/boot/dts/{ => cavium}/thunder-88xx.dts (100%) + rename arch/arm64/boot/dts/{ => cavium}/thunder-88xx.dtsi (100%) + create mode 100644 scripts/Makefile.dtbinst +Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (bb3adf0f4627 Merge branch 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/marvell,berlin.txt | 10 ++ + arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts | 9 ++ + arch/arm/boot/dts/berlin2.dtsi | 71 +++++++++++ + arch/arm/boot/dts/berlin2cd-google-chromecast.dts | 26 ++++ + arch/arm/boot/dts/berlin2cd.dtsi | 46 ++++++++ + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 8 ++ + arch/arm/boot/dts/berlin2q.dtsi | 42 ++++++- + arch/arm/mach-berlin/Kconfig | 4 +- + drivers/reset/Makefile | 1 + + drivers/reset/reset-berlin.c | 131 +++++++++++++++++++++ + 10 files changed, 346 insertions(+), 2 deletions(-) + create mode 100644 drivers/reset/reset-berlin.c +Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support) +$ git merge cortex-m/for-next +Already up-to-date. +Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (e173c7d26265 Merge branch 'imx/dt' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/boot/dts/vf610-cosmic.dts +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.txt | 38 ++ + .../devicetree/bindings/clock/vf610-clock.txt | 15 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 4 + + arch/arm/boot/dts/imx51.dtsi | 12 +- + arch/arm/boot/dts/imx53.dtsi | 25 +- + arch/arm/boot/dts/imx6dl.dtsi | 4 + + arch/arm/boot/dts/imx6q-tbs2910.dts | 429 ++++++++++++++++++ + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-rex.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- + arch/arm/boot/dts/imx6sx-sdb.dts | 62 +++ + arch/arm/boot/dts/imx6sx.dtsi | 2 +- + arch/arm/boot/dts/ls1021a-qds.dts | 240 ++++++++++ + arch/arm/boot/dts/ls1021a-twr.dts | 127 ++++++ + arch/arm/boot/dts/ls1021a.dtsi | 408 +++++++++++++++++ + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 54 +++ + arch/arm/boot/dts/vf-colibri.dtsi | 142 ++++++ + arch/arm/boot/dts/vf500-colibri-eval-v3.dts | 17 + + arch/arm/boot/dts/vf500-colibri.dtsi | 20 + + arch/arm/boot/dts/vf500.dtsi | 171 ++++++++ + arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 33 +- + arch/arm/boot/dts/vf610-colibri.dtsi | 100 +---- + arch/arm/boot/dts/vf610-cosmic.dts | 14 +- + arch/arm/boot/dts/vf610-twr.dts | 37 +- + arch/arm/boot/dts/vf610.dtsi | 486 +-------------------- + arch/arm/boot/dts/vfxxx.dtsi | 436 ++++++++++++++++++ + arch/arm/mach-imx/Kconfig | 35 +- + arch/arm/mach-imx/Makefile | 6 +- + arch/arm/mach-imx/anatop.c | 34 +- + arch/arm/mach-imx/clk-cpu.c | 107 +++++ + arch/arm/mach-imx/clk-imx51-imx53.c | 14 +- + arch/arm/mach-imx/clk-vf610.c | 21 +- + arch/arm/mach-imx/clk.h | 4 + + arch/arm/mach-imx/common.h | 3 +- + arch/arm/mach-imx/imx25-dt.c | 9 - + arch/arm/mach-imx/imx27-dt.c | 3 - + arch/arm/mach-imx/imx31-dt.c | 9 - + arch/arm/mach-imx/imx35-dt.c | 10 - + arch/arm/mach-imx/mach-imx50.c | 9 - + arch/arm/mach-imx/mach-imx51.c | 2 - + arch/arm/mach-imx/mach-imx53.c | 4 +- + arch/arm/mach-imx/mach-imx6q.c | 3 - + arch/arm/mach-imx/mach-imx6sl.c | 3 - + arch/arm/mach-imx/mach-imx6sx.c | 54 ++- + arch/arm/mach-imx/mach-ls1021a.c | 22 + + arch/arm/mach-imx/mach-vf610.c | 10 - + arch/arm/mach-imx/mmdc.c | 17 + + arch/arm/mach-imx/mxc.h | 2 + + arch/arm/mach-imx/platsmp.c | 33 ++ + arch/arm/mach-imx/pm-imx6.c | 10 +- + arch/arm/mach-imx/suspend-imx6.S | 14 +- + arch/arm/mach-imx/system.c | 15 - + include/dt-bindings/clock/imx5-clock.h | 5 +- + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 39 ++ + 57 files changed, 2641 insertions(+), 740 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6q-tbs2910.dts + create mode 100644 arch/arm/boot/dts/ls1021a-qds.dts + create mode 100644 arch/arm/boot/dts/ls1021a-twr.dts + create mode 100644 arch/arm/boot/dts/ls1021a.dtsi + create mode 100644 arch/arm/boot/dts/vf-colibri-eval-v3.dtsi + create mode 100644 arch/arm/boot/dts/vf-colibri.dtsi + create mode 100644 arch/arm/boot/dts/vf500-colibri-eval-v3.dts + create mode 100644 arch/arm/boot/dts/vf500-colibri.dtsi + create mode 100644 arch/arm/boot/dts/vf500.dtsi + create mode 100644 arch/arm/boot/dts/vfxxx.dtsi + create mode 100644 arch/arm/mach-imx/clk-cpu.c + create mode 100644 arch/arm/mach-imx/mach-ls1021a.c +Merging ixp4xx/next (19f949f52599 Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/k2e-evm.dts | 12 ++++++++++ + arch/arm/boot/dts/k2e.dtsi | 45 +++++++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/k2l-evm.dts | 12 ++++++++++ + arch/arm/boot/dts/keystone.dtsi | 45 +++++++++++++++++++++++++++++++++++++ + arch/arm/configs/keystone_defconfig | 7 ++++++ + arch/arm/mach-keystone/Kconfig | 2 ++ + drivers/soc/ti/knav_qmss.h | 8 +++---- + drivers/soc/ti/knav_qmss_queue.c | 9 ++++---- + 8 files changed, 132 insertions(+), 8 deletions(-) +Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) +$ git merge msm/for-next +Already up-to-date. +Merging mvebu/for-next (0626430385b7 Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 17 +- + arch/arm/boot/dts/armada-370.dtsi | 1 + + arch/arm/boot/dts/armada-375.dtsi | 12 +- + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 58 ++--- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 73 +++--- + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 15 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 15 +- + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 15 +- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 166 +++++++------- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 14 +- + arch/arm/boot/dts/armada-xp.dtsi | 38 ++++ + arch/arm/boot/dts/kirkwood-dir665.dts | 278 +++++++++++++++++++++++ + arch/arm/configs/multi_v5_defconfig | 2 + + arch/arm/configs/mvebu_v5_defconfig | 2 + + arch/arm/mach-mvebu/board-v7.c | 2 +- + arch/arm/plat-orion/gpio.c | 36 ++- + 17 files changed, 543 insertions(+), 202 deletions(-) + create mode 100644 arch/arm/boot/dts/kirkwood-dir665.dts +Merging renesas/next (fa8b1f634502 Merge branches 'heads/defconfig-for-v3.19', 'heads/soc-for-v3.19', 'heads/dt-for-v3.19' and 'heads/dt-cleanups-for-v3.19' into next) +$ git merge renesas/next +Removing arch/arm/mach-shmobile/clock-r8a7791.c +Removing arch/arm/mach-shmobile/board-koelsch.c +Removing arch/arm/mach-shmobile/board-koelsch-reference.c +Removing arch/arm/configs/koelsch_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/clock/renesas,sh73a0-cpg-clocks.txt | 31 ++ + MAINTAINERS | 1 - + arch/arm/boot/dts/Makefile | 1 - + arch/arm/boot/dts/r8a73a4.dtsi | 10 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 4 + + arch/arm/boot/dts/r8a7740.dtsi | 44 +- + arch/arm/boot/dts/r8a7778-bockw-reference.dts | 4 + + arch/arm/boot/dts/r8a7778.dtsi | 42 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 83 ++++ + arch/arm/boot/dts/r8a7779.dtsi | 34 +- + arch/arm/boot/dts/r8a7790-lager.dts | 173 ++++++- + arch/arm/boot/dts/r8a7790.dtsi | 400 +++++++++++++++- + arch/arm/boot/dts/r8a7791-henninger.dts | 11 + + arch/arm/boot/dts/r8a7791-koelsch.dts | 103 +++- + arch/arm/boot/dts/r8a7791.dtsi | 374 ++++++++++++++- + arch/arm/boot/dts/r8a7794-alt.dts | 2 +- + arch/arm/boot/dts/r8a7794.dtsi | 14 +- + arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi | 41 ++ + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 7 +- + arch/arm/boot/dts/sh73a0.dtsi | 375 +++++++++++++++ + arch/arm/configs/ape6evm_defconfig | 1 + + arch/arm/configs/koelsch_defconfig | 113 ----- + arch/arm/configs/shmobile_defconfig | 4 +- + arch/arm/mach-shmobile/Kconfig | 21 +- + arch/arm/mach-shmobile/Makefile | 5 +- + arch/arm/mach-shmobile/Makefile.boot | 1 - + arch/arm/mach-shmobile/board-armadillo800eva.c | 12 +- + arch/arm/mach-shmobile/board-koelsch-reference.c | 113 ----- + arch/arm/mach-shmobile/board-koelsch.c | 523 --------------------- + arch/arm/mach-shmobile/board-lager-reference.c | 80 ---- + arch/arm/mach-shmobile/board-marzen-reference.c | 1 - + arch/arm/mach-shmobile/clock-r8a7740.c | 7 +- + arch/arm/mach-shmobile/clock-r8a7790.c | 2 +- + arch/arm/mach-shmobile/clock-r8a7791.c | 338 ------------- + arch/arm/mach-shmobile/clock.c | 32 +- + arch/arm/mach-shmobile/clock.h | 14 - + arch/arm/mach-shmobile/common.h | 5 - + arch/arm/mach-shmobile/platsmp-apmu.c | 27 +- + arch/arm/mach-shmobile/platsmp-apmu.h | 32 ++ + arch/arm/mach-shmobile/pm-r8a7740.c | 44 +- + arch/arm/mach-shmobile/r8a7791.h | 3 - + arch/arm/mach-shmobile/setup-r8a7740.c | 11 + + arch/arm/mach-shmobile/setup-r8a7778.c | 3 +- + arch/arm/mach-shmobile/setup-r8a7791.c | 181 +------ + arch/arm/mach-shmobile/setup-rcar-gen2.c | 72 ++- + arch/arm/mach-shmobile/setup-sh7372.c | 1 + + arch/arm/mach-shmobile/setup-sh73a0.c | 5 +- + arch/arm/mach-shmobile/smp-r8a7790.c | 16 +- + arch/arm/mach-shmobile/smp-r8a7791.c | 12 +- + arch/arm/mach-shmobile/timer.c | 23 +- + drivers/clk/shmobile/Makefile | 1 + + drivers/clk/shmobile/clk-sh73a0.c | 202 ++++++++ + include/dt-bindings/clock/r8a7740-clock.h | 1 + + include/dt-bindings/clock/r8a7790-clock.h | 14 +- + include/dt-bindings/clock/r8a7791-clock.h | 11 +- + include/dt-bindings/clock/r8a7794-clock.h | 2 + + include/dt-bindings/clock/sh73a0-clock.h | 79 ++++ + 57 files changed, 2196 insertions(+), 1570 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/renesas,sh73a0-cpg-clocks.txt + create mode 100644 arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi + delete mode 100644 arch/arm/configs/koelsch_defconfig + delete mode 100644 arch/arm/mach-shmobile/board-koelsch-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-koelsch.c + delete mode 100644 arch/arm/mach-shmobile/clock-r8a7791.c + create mode 100644 arch/arm/mach-shmobile/platsmp-apmu.h + create mode 100644 drivers/clk/shmobile/clk-sh73a0.c + create mode 100644 include/dt-bindings/clock/sh73a0-clock.h +Merging samsung/for-next (5d184e4fb69a Merge branch 'v3.19-next/pm-samsung-2' into for-next) +$ git merge samsung/for-next +Merge made by the 'recursive' strategy. + Documentation/arm/firmware.txt | 28 +-- + arch/arm/include/asm/firmware.h | 10 +- + arch/arm/mach-exynos/Kconfig | 5 + + arch/arm/mach-exynos/Makefile | 4 +- + arch/arm/mach-exynos/common.h | 13 ++ + arch/arm/mach-exynos/exynos.c | 5 +- + arch/arm/mach-exynos/firmware.c | 67 ++++++- + arch/arm/mach-exynos/platsmp.c | 23 +++ + arch/arm/mach-exynos/pm.c | 310 ++++------------------------ + arch/arm/mach-exynos/pmu.c | 1 + + arch/arm/mach-exynos/regs-pmu.h | 3 + + arch/arm/mach-exynos/sleep.S | 28 +++ + arch/arm/mach-exynos/smc.h | 4 + + arch/arm/mach-exynos/suspend.c | 356 +++++++++++++++++++++++++++++++++ + arch/arm/mach-tegra/cpuidle-tegra114.c | 2 +- + arch/arm/plat-samsung/Makefile | 1 + + 16 files changed, 559 insertions(+), 301 deletions(-) + create mode 100644 arch/arm/mach-exynos/suspend.c +Merging sunxi/sunxi/for-next (2f38ad8b07ac Merge branch 'sunxi/dt-for-3.19' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig.debug +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/arm/sunxi/README | 16 +- + Documentation/devicetree/bindings/arm/sunxi.txt | 12 + + Documentation/devicetree/bindings/clock/sunxi.txt | 10 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/Kconfig.debug | 10 + + arch/arm/boot/dts/Makefile | 5 + + arch/arm/boot/dts/sun4i-a10-a1000.dts | 46 +- + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 46 +- + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 46 +- + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 46 +- + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 46 +- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 46 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 46 +- + arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 46 +- + arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 6 +- + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 48 +- + arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 46 +- + arch/arm/boot/dts/sun6i-a31-colombus.dts | 46 +- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 46 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 46 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 6 +- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 214 +++++++++ + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 46 +- + arch/arm/boot/dts/sun7i-a20-m3.dts | 168 +++++++ + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 228 +++++++++ + arch/arm/boot/dts/sun7i-a20.dtsi | 27 +- + arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 46 +- + arch/arm/boot/dts/sun8i-a23.dtsi | 6 +- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 119 +++++ + arch/arm/boot/dts/sun9i-a80.dtsi | 514 +++++++++++++++++++++ + arch/arm/boot/dts/sunxi-common-regulators.dtsi | 46 +- + arch/arm/mach-sunxi/Kconfig | 7 + + arch/arm/mach-sunxi/sunxi.c | 9 + + drivers/clk/sunxi/Makefile | 1 + + drivers/clk/sunxi/clk-factors.c | 2 +- + drivers/clk/sunxi/clk-factors.h | 3 +- + drivers/clk/sunxi/clk-mod0.c | 1 + + drivers/clk/sunxi/clk-sun8i-mbus.c | 1 + + drivers/clk/sunxi/clk-sun9i-core.c | 271 +++++++++++ + drivers/clk/sunxi/clk-sunxi.c | 32 ++ + 40 files changed, 2307 insertions(+), 100 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/sunxi.txt + create mode 100644 arch/arm/boot/dts/sun7i-a20-bananapi.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-m3.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts + create mode 100644 arch/arm/boot/dts/sun9i-a80-optimus.dts + create mode 100644 arch/arm/boot/dts/sun9i-a80.dtsi + create mode 100644 drivers/clk/sunxi/clk-sun9i-core.c +Merging tegra/for-next (5599b9197647 Merge branch for-3.18/defconfig into for-next) +$ git merge tegra/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (0a6479b0ffad arm64: Remove unneeded extern keyword) +$ 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 +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 (ae72758f1dd9 c6x: fix build failure caused by cache.h) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (21bd887cd7c4 CRISv32: Remove last remnants of ETRAX_SPI_MMC_BOARD) +$ git merge cris/for-next +Auto-merging scripts/headers.sh +Auto-merging arch/cris/include/asm/Kbuild +Auto-merging arch/cris/arch-v32/drivers/sync_serial.c +Auto-merging arch/cris/arch-v32/drivers/Kconfig +Merge made by the 'recursive' strategy. + arch/cris/arch-v10/lib/usercopy.c | 14 +- + arch/cris/arch-v32/drivers/Kconfig | 8 +- + arch/cris/arch-v32/drivers/Makefile | 1 - + arch/cris/arch-v32/drivers/i2c.h | 1 - + arch/cris/arch-v32/drivers/sync_serial.c | 1430 ++++++++++++---------- + arch/cris/arch-v32/kernel/debugport.c | 82 +- + arch/cris/arch-v32/kernel/time.c | 29 +- + arch/cris/arch-v32/lib/usercopy.c | 15 +- + arch/cris/arch-v32/mach-fs/pinmux.c | 152 +-- + arch/cris/include/arch-v32/mach-fs/mach/pinmux.h | 2 - + arch/cris/include/asm/Kbuild | 4 - + arch/cris/include/uapi/asm/Kbuild | 4 +- + arch/cris/kernel/crisksyms.c | 9 +- + arch/cris/kernel/traps.c | 61 +- + arch/cris/mm/init.c | 38 +- + arch/cris/mm/ioremap.c | 3 +- + scripts/headers.sh | 2 - + 17 files changed, 1039 insertions(+), 816 deletions(-) +Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (0f33be009b89 Linux 3.17-rc6) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (bcf8eb09b564 nubus: Remove superfluous interrupt disable/restore) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + drivers/nubus/nubus.c | 4 ---- + 1 file changed, 4 deletions(-) +Merging m68knommu/for-next (cac7f2429872 Linux 3.18-rc2) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (a4f174dee4ae microblaze: Wire up bpf syscall) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (456fbdb023b2 Merge branch '3.18-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging include/linux/irqchip/mips-gic.h +Removing arch/mips/mti-sead3/sead3-serial.c +Removing arch/mips/kernel/irq-gic.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mips/cpu_irq.txt | 4 +- + arch/mips/Kconfig | 12 +- + arch/mips/ar7/platform.c | 24 +- + arch/mips/ath79/irq.c | 1 - + arch/mips/ath79/setup.c | 5 + + arch/mips/bcm47xx/bcm47xx_private.h | 6 + + arch/mips/bcm47xx/irq.c | 8 + + arch/mips/bcm47xx/nvram.c | 96 +-- + arch/mips/bcm47xx/setup.c | 91 +-- + arch/mips/bcm47xx/sprom.c | 68 ++ + arch/mips/bcm63xx/cpu.c | 2 +- + arch/mips/cavium-octeon/octeon-irq.c | 2 + + arch/mips/include/asm/irq.h | 3 + + arch/mips/include/asm/irq_cpu.h | 4 +- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h | 1 + + arch/mips/include/asm/mach-generic/irq.h | 6 + + arch/mips/include/asm/mach-malta/irq.h | 1 - + arch/mips/include/asm/mach-sead3/irq.h | 1 - + arch/mips/include/asm/mips-boards/maltaint.h | 24 +- + arch/mips/include/asm/mips-boards/sead3int.h | 15 +- + arch/mips/include/asm/octeon/cvmx-pow.h | 69 +- + arch/mips/include/asm/time.h | 1 + + arch/mips/include/asm/uaccess.h | 27 - + arch/mips/include/uapi/asm/unistd.h | 15 +- + arch/mips/kernel/Makefile | 1 - + arch/mips/kernel/cevt-gic.c | 16 +- + arch/mips/kernel/cevt-r4k.c | 6 +- + arch/mips/kernel/cpu-probe.c | 66 +- + arch/mips/kernel/crash_dump.c | 4 +- + arch/mips/kernel/csrc-gic.c | 12 +- + arch/mips/kernel/i8259.c | 24 +- + arch/mips/kernel/irq-gic.c | 402 ------------ + arch/mips/kernel/irq_cpu.c | 48 +- + arch/mips/kernel/mips_ksyms.c | 4 - + arch/mips/kernel/perf_event_mipsxx.c | 30 +- + arch/mips/kernel/process.c | 54 +- + arch/mips/kernel/scall32-o32.S | 1 + + arch/mips/kernel/scall64-64.S | 1 + + arch/mips/kernel/scall64-n32.S | 1 + + arch/mips/kernel/scall64-o32.S | 1 + + arch/mips/kernel/setup.c | 5 +- + arch/mips/kernel/smp-cmp.c | 2 +- + arch/mips/kernel/smp-cps.c | 6 +- + arch/mips/kernel/smp-gic.c | 2 +- + arch/mips/kernel/smp-mt.c | 6 +- + arch/mips/lantiq/irq.c | 8 +- + arch/mips/lib/strlen_user.S | 3 - + arch/mips/lib/strnlen_user.S | 6 +- + arch/mips/loongson/common/gpio.c | 2 +- + arch/mips/math-emu/ieee754dp.c | 2 +- + arch/mips/math-emu/ieee754sp.c | 2 +- + arch/mips/mm/sc-r5k.c | 2 +- + arch/mips/mti-malta/malta-int.c | 327 ++-------- + arch/mips/mti-malta/malta-time.c | 47 +- + arch/mips/mti-sead3/sead3-ehci.c | 8 +- + arch/mips/mti-sead3/sead3-int.c | 131 +--- + arch/mips/mti-sead3/sead3-net.c | 14 +- + arch/mips/mti-sead3/sead3-platform.c | 18 +- + arch/mips/mti-sead3/sead3-serial.c | 45 -- + arch/mips/mti-sead3/sead3-time.c | 35 +- + arch/mips/oprofile/op_model_mipsxx.c | 18 +- + arch/mips/pci/msi-xlp.c | 4 +- + arch/mips/pci/ops-bcm63xx.c | 2 +- + arch/mips/pci/ops-nile4.c | 12 +- + arch/mips/pci/ops-pmcmsp.c | 12 - + arch/mips/pci/pci-ar71xx.c | 13 - + arch/mips/pci/pci-ar724x.c | 23 - + arch/mips/pci/pci-rt3883.c | 9 - + arch/mips/pci/pci-tx4939.c | 2 +- + arch/mips/pmcs-msp71xx/msp_prom.c | 2 +- + arch/mips/ralink/irq.c | 10 +- + arch/mips/rb532/gpio.c | 2 +- + arch/mips/sgi-ip22/ip22-mc.c | 6 +- + arch/mips/sgi-ip22/ip28-berr.c | 6 +- + arch/mips/sgi-ip27/ip27-klnuma.c | 5 +- + arch/mips/sgi-ip27/ip27-memory.c | 5 +- + arch/mips/sibyte/swarm/rtc_m41t81.c | 4 +- + arch/mips/sibyte/swarm/rtc_xicor1241.c | 4 +- + arch/mips/sibyte/swarm/setup.c | 2 +- + arch/mips/txx9/generic/setup_tx4927.c | 4 +- + arch/mips/txx9/generic/setup_tx4938.c | 4 +- + arch/mips/txx9/generic/setup_tx4939.c | 4 +- + drivers/bcma/driver_mips.c | 13 +- + drivers/irqchip/Kconfig | 4 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-mips-gic.c | 721 +++++++++++++++++++++ + drivers/ssb/driver_mipscore.c | 14 +- + .../asm/gic.h => include/linux/irqchip/mips-gic.h | 145 ++--- + 88 files changed, 1388 insertions(+), 1491 deletions(-) + delete mode 100644 arch/mips/kernel/irq-gic.c + delete mode 100644 arch/mips/mti-sead3/sead3-serial.c + create mode 100644 drivers/irqchip/irq-mips-gic.c + rename arch/mips/include/asm/gic.h => include/linux/irqchip/mips-gic.h (71%) +Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done()) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) +$ git merge parisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (5e40d331bd72 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) +$ git merge powerpc/next +Already up-to-date. +Merging powerpc-mpe/next (8a97577a5967 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (cb0446c1b625 Revert "powerpc/fsl_msi: spread msi ints across different MSIRs") +$ 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 (eaf785d51dc6 s390/cpum_sf: Remove initialization of PMU event index) +$ git merge s390/features +Auto-merging mm/memory.c +Auto-merging mm/huge_memory.c +Auto-merging include/linux/mm.h +Auto-merging arch/s390/kernel/perf_cpum_sf.c +Auto-merging arch/s390/kernel/ftrace.c +Merge made by the 'recursive' strategy. + arch/s390/include/asm/cmpxchg.h | 240 +++------------------------------------ + arch/s390/include/asm/ftrace.h | 52 ++++++++- + arch/s390/include/asm/kprobes.h | 1 + + arch/s390/include/asm/lowcore.h | 4 +- + arch/s390/include/asm/pci.h | 5 +- + arch/s390/include/asm/pci_io.h | 6 +- + arch/s390/include/asm/pgalloc.h | 2 - + arch/s390/include/asm/pgtable.h | 33 +++++- + arch/s390/include/asm/spinlock.h | 9 +- + arch/s390/kernel/asm-offsets.c | 5 +- + arch/s390/kernel/compat_signal.c | 2 +- + arch/s390/kernel/early.c | 4 - + arch/s390/kernel/ftrace.c | 136 ++++++++++++++-------- + arch/s390/kernel/idle.c | 3 +- + arch/s390/kernel/kprobes.c | 178 +++++++++++++++++++---------- + arch/s390/kernel/mcount.S | 1 + + arch/s390/kernel/perf_cpum_sf.c | 1 - + arch/s390/kernel/process.c | 2 +- + arch/s390/kernel/setup.c | 2 - + arch/s390/kernel/signal.c | 2 +- + arch/s390/kernel/smp.c | 1 - + arch/s390/kernel/time.c | 3 +- + arch/s390/kernel/traps.c | 14 ++- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/s390/kvm/priv.c | 17 ++- + arch/s390/mm/fault.c | 6 +- + arch/s390/mm/pgtable.c | 185 +++++++++++++----------------- + arch/s390/pci/pci.c | 9 +- + arch/s390/pci/pci_clp.c | 1 + + include/asm-generic/pgtable.h | 11 ++ + include/linux/kprobes.h | 1 + + include/linux/mm.h | 11 ++ + kernel/kprobes.c | 18 +-- + mm/huge_memory.c | 5 +- + mm/memory.c | 2 +- + scripts/recordmcount.c | 2 +- + scripts/recordmcount.pl | 2 +- + 37 files changed, 472 insertions(+), 506 deletions(-) +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (01f7ae056916 arch: tile: kernel: signal.c: Use __copy_from/to_user() instead of __get/put_user()) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/kernel/signal.c | 14 +++----------- + 1 file changed, 3 insertions(+), 11 deletions(-) +Merging uml/next (989e59fa41c5 um: Include generic barrier.h) +$ git merge uml/next +Resolved 'arch/um/include/asm/Kbuild' using previous resolution. +Removing arch/x86/um/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ia64/sysdep/skas_ptrace.h +Auto-merging arch/um/os-Linux/skas/process.c +Auto-merging arch/um/kernel/um_arch.c +Auto-merging arch/um/kernel/trap.c +Auto-merging arch/um/kernel/ptrace.c +Removing arch/um/include/shared/skas_ptrace.h +Removing arch/um/include/shared/skas/proc_mm.h +Auto-merging arch/um/include/shared/os.h +Auto-merging arch/um/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 50e5cb2af174] Merge remote-tracking branch 'uml/next' +$ git diff -M --stat --summary HEAD^.. + arch/um/include/shared/os.h | 2 - + arch/um/include/shared/skas/proc_mm.h | 44 ------ + arch/um/include/shared/skas/skas.h | 3 - + arch/um/include/shared/skas_ptrace.h | 14 -- + arch/um/kernel/ptrace.c | 32 ---- + arch/um/kernel/reboot.c | 35 ++--- + arch/um/kernel/skas/mmu.c | 68 +++------ + arch/um/kernel/skas/process.c | 27 ---- + arch/um/kernel/trap.c | 2 +- + arch/um/kernel/um_arch.c | 10 -- + arch/um/os-Linux/process.c | 16 -- + arch/um/os-Linux/skas/mem.c | 100 ++---------- + arch/um/os-Linux/skas/process.c | 200 ++++++------------------ + arch/um/os-Linux/start_up.c | 154 ------------------- + arch/um/sys-ia64/sysdep/skas_ptrace.h | 22 --- + arch/um/sys-ppc/shared/sysdep/skas_ptrace.h | 22 --- + arch/x86/um/ldt.c | 227 ++++++---------------------- + arch/x86/um/shared/sysdep/faultinfo_32.h | 3 - + arch/x86/um/shared/sysdep/faultinfo_64.h | 3 - + arch/x86/um/shared/sysdep/skas_ptrace.h | 22 --- + 20 files changed, 148 insertions(+), 858 deletions(-) + delete mode 100644 arch/um/include/shared/skas/proc_mm.h + delete mode 100644 arch/um/include/shared/skas_ptrace.h + delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h + delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h + delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (66acb0216d5a Merge tag 'xtensa-for-next-20141021-1' of git://github.com/jcmvbkbc/linux-xtensa into for_next) +$ git merge xtensa/for_next +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 4 +- + arch/xtensa/boot/dts/lx200mx.dts | 16 ++++ + arch/xtensa/configs/generic_kc705_defconfig | 131 +++++++++++++++++++++++++++ + arch/xtensa/configs/smp_lx200_defconfig | 135 ++++++++++++++++++++++++++++ + arch/xtensa/include/asm/pgtable.h | 2 + + arch/xtensa/include/uapi/asm/unistd.h | 12 ++- + 6 files changed, 296 insertions(+), 4 deletions(-) + create mode 100644 arch/xtensa/boot/dts/lx200mx.dts + create mode 100644 arch/xtensa/configs/generic_kc705_defconfig + create mode 100644 arch/xtensa/configs/smp_lx200_defconfig +Merging btrfs/next (a43bb39b5c71 btrfs: Fix compile error when CONFIG_SECURITY is not set.) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (c27a3e4d667f libceph: do not hard code max auth ticket len) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (6212096bb0a1 [CIFS] Update modinfo cifs version for cifs.ko) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.h | 2 +- + fs/cifs/smb2ops.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- + fs/cifs/smb2pdu.c | 3 +-- + fs/cifs/smb2pdu.h | 19 +++++++++++++++++ + 4 files changed, 83 insertions(+), 4 deletions(-) +Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (831115af5ca3 eCryptfs: Remove unnecessary casts when parsing packet lengths) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/file.c | 12 ------------ + fs/ecryptfs/keystore.c | 6 +++--- + fs/ecryptfs/main.c | 16 +++++++++++++--- + 3 files changed, 16 insertions(+), 18 deletions(-) +Merging ext3/for_next (3c9cafe05ff0 fs, jbd: use a more generic hash function) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (ae9e9c6aeea6 ext4: make ext4_ext_convert_to_initialized() return proper number of blocks) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (d5053a34a9cc f2fs: introduce -o fastboot for reducing booting time only) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.txt | 7 + + fs/f2fs/acl.c | 148 +++++++++++- + fs/f2fs/acl.h | 5 +- + fs/f2fs/checkpoint.c | 6 + + fs/f2fs/data.c | 162 +++++++------ + fs/f2fs/debug.c | 3 + + fs/f2fs/dir.c | 309 ++++++++++++++---------- + fs/f2fs/f2fs.h | 138 +++++++++-- + fs/f2fs/file.c | 95 +++++--- + fs/f2fs/gc.c | 14 +- + fs/f2fs/inline.c | 476 ++++++++++++++++++++++++++++--------- + fs/f2fs/inode.c | 42 +++- + fs/f2fs/namei.c | 44 ++-- + fs/f2fs/node.h | 5 +- + fs/f2fs/recovery.c | 5 +- + fs/f2fs/segment.c | 98 +++++--- + fs/f2fs/segment.h | 5 +- + fs/f2fs/super.c | 23 +- + fs/f2fs/xattr.c | 6 +- + fs/f2fs/xattr.h | 6 +- + include/linux/f2fs_fs.h | 27 ++- + 21 files changed, 1164 insertions(+), 460 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 d3c4e9e2d7ad] Merge remote-tracking branch 'fscache/fscache' +$ git diff -M --stat --summary HEAD^.. +Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (1a8550332a7f GFS2: If we use up our block reservation, request more next time) +$ git merge gfs2/master +Merge made by the 'recursive' strategy. + fs/gfs2/file.c | 3 ++- + fs/gfs2/incore.h | 1 + + fs/gfs2/inode.c | 6 +---- + fs/gfs2/rgrp.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- + fs/gfs2/rgrp.h | 1 + + 5 files changed, 69 insertions(+), 11 deletions(-) +Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr) +$ git merge jfs/jfs-next +Already up-to-date. +Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) +$ git merge logfs/master +Auto-merging fs/logfs/super.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/super.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (6debb30deb5e NFS: SEEK is an NFS v4.2 feature) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/blocklayout/blocklayout.c | 2 +- + fs/nfs/blocklayout/rpc_pipefs.c | 14 +++++++++----- + fs/nfs/delegation.c | 2 ++ + fs/nfs/dir.c | 1 + + fs/nfs/direct.c | 1 + + fs/nfs/filelayout/filelayout.c | 3 --- + fs/nfs/inode.c | 2 +- + fs/nfs/netns.h | 1 + + fs/nfs/nfs4proc.c | 37 +++++++++++++------------------------ + fs/nfs/write.c | 2 -- + include/linux/nfs_xdr.h | 11 +++++++++++ + 11 files changed, 40 insertions(+), 36 deletions(-) +Merging nfsd/nfsd-next (ccc6398ea5d5 nfsd: clean up comments over nfs4_file definition) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4state.c | 2 +- + fs/nfsd/state.h | 14 +++++++++----- + fs/nfsd/vfs.c | 10 +++++++--- + net/sunrpc/xdr.c | 9 +++++---- + 4 files changed, 22 insertions(+), 13 deletions(-) +Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error) +$ 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 (91401a34038e UBI: Fastmap: Calc fastmap size correctly) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (5d11fb4b9a1d xfs: rework zero range to prevent invalid i_size updates) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/xfs_bmap_util.c | 72 ++++++++++++++------------------------------------ + fs/xfs/xfs_itable.c | 20 +++++++++----- + mm/truncate.c | 1 - + 3 files changed, 34 insertions(+), 59 deletions(-) +Merging file-locks/linux-next (1b2b32dcdb3d locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (9c883c360fd0 Merge branch 'for-lustre' into for-next) +$ git merge vfs/for-next +Auto-merging security/integrity/ima/ima_appraise.c +Auto-merging mm/memcontrol.c +Auto-merging kernel/events/core.c +Auto-merging fs/overlayfs/readdir.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/nfs/blocklayout/rpc_pipefs.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/ecryptfs/file.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/nfs/Exporting | 23 +- + Documentation/filesystems/porting | 8 + + arch/alpha/kernel/osf_sys.c | 7 +- + arch/parisc/hpux/fs.c | 7 +- + arch/powerpc/oprofile/cell/spu_task_sync.c | 10 +- + arch/powerpc/platforms/cell/spufs/inode.c | 2 +- + arch/s390/hypfs/hypfs_dbfs.c | 3 +- + arch/x86/ia32/ia32_aout.c | 8 +- + drivers/block/drbd/drbd_debugfs.c | 6 +- + drivers/gpu/drm/armada/armada_gem.c | 2 +- + drivers/media/pci/zoran/zoran_procfs.c | 4 +- + drivers/misc/genwqe/card_dev.c | 2 +- + drivers/s390/char/hmcdrv_dev.c | 16 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 8 +- + drivers/staging/lustre/lustre/libcfs/tracefile.c | 4 +- + drivers/staging/lustre/lustre/llite/dcache.c | 21 +- + drivers/staging/lustre/lustre/llite/dir.c | 9 +- + drivers/staging/lustre/lustre/llite/file.c | 158 ++++----- + .../staging/lustre/lustre/llite/llite_internal.h | 10 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 8 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 12 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 8 +- + drivers/staging/lustre/lustre/llite/lloop.c | 7 +- + drivers/staging/lustre/lustre/llite/namei.c | 388 ++++++++------------- + drivers/staging/lustre/lustre/llite/statahead.c | 33 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 4 +- + drivers/staging/lustre/lustre/llite/xattr.c | 9 +- + fs/9p/vfs_inode.c | 2 +- + fs/9p/vfs_inode_dotl.c | 4 +- + fs/affs/amigaffs.c | 2 +- + fs/affs/inode.c | 4 +- + fs/affs/namei.c | 40 +-- + fs/afs/dir.c | 80 ++--- + fs/afs/inode.c | 4 +- + fs/afs/mntpt.c | 22 +- + fs/afs/write.c | 9 +- + fs/autofs4/expire.c | 42 +-- + fs/autofs4/root.c | 25 +- + fs/befs/linuxvfs.c | 16 +- + fs/binfmt_aout.c | 8 +- + fs/btrfs/inode.c | 2 +- + fs/btrfs/ioctl.c | 2 +- + fs/cachefiles/namei.c | 21 +- + fs/cachefiles/xattr.c | 15 +- + fs/ceph/debugfs.c | 14 +- + fs/ceph/dir.c | 56 ++- + fs/ceph/file.c | 6 +- + fs/ceph/inode.c | 18 +- + fs/cifs/cifsfs.c | 3 +- + fs/cifs/cifsglob.h | 6 + + fs/cifs/file.c | 12 +- + fs/cifs/inode.c | 2 +- + fs/cifs/readdir.c | 10 +- + fs/coda/cache.c | 2 +- + fs/coda/coda_linux.c | 6 - + fs/coda/coda_linux.h | 1 - + fs/coda/dir.c | 12 +- + fs/compat.c | 21 +- + fs/configfs/dir.c | 2 +- + fs/dcache.c | 269 +++++--------- + fs/debugfs/inode.c | 2 +- + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/file.c | 6 +- + fs/ecryptfs/mmap.c | 2 +- + fs/efivarfs/file.c | 4 +- + fs/exportfs/expfs.c | 7 +- + fs/fat/dir.c | 5 +- + fs/fuse/dir.c | 4 +- + fs/fuse/file.c | 2 +- + fs/gfs2/export.c | 8 +- + fs/gfs2/inode.c | 19 +- + fs/hppfs/hppfs.c | 5 +- + fs/jfs/namei.c | 18 +- + fs/kernfs/dir.c | 2 +- + fs/libfs.c | 12 +- + fs/lockd/svcsubs.c | 2 +- + fs/ncpfs/dir.c | 12 +- + fs/ncpfs/file.c | 14 +- + fs/ncpfs/mmap.c | 4 +- + fs/ncpfs/ncplib_kernel.h | 4 +- + fs/nfs/blocklayout/rpc_pipefs.c | 2 +- + fs/nfs/dir.c | 6 +- + fs/nfs/getroot.c | 4 +- + fs/nfsd/nfs4recover.c | 7 +- + fs/nfsd/nfs4xdr.c | 2 +- + fs/nfsd/nfsctl.c | 37 +- + fs/nfsd/vfs.c | 16 +- + fs/nfsd/vfs.h | 4 +- + fs/notify/fsnotify.c | 4 +- + fs/ntfs/namei.c | 4 +- + fs/ocfs2/dcache.c | 20 +- + fs/ocfs2/dir.c | 8 +- + fs/ocfs2/dlmfs/dlmfs.c | 4 +- + fs/ocfs2/dlmglue.c | 3 +- + fs/ocfs2/journal.c | 8 +- + fs/open.c | 4 +- + fs/overlayfs/readdir.c | 8 +- + fs/proc/base.c | 4 +- + fs/readdir.c | 21 +- + fs/reiserfs/xattr.c | 21 +- + fs/sync.c | 2 +- + fs/xattr.c | 16 +- + include/linux/audit.h | 9 + + include/linux/cgroup.h | 4 +- + include/linux/dcache.h | 9 +- + include/linux/fs.h | 11 +- + ipc/mqueue.c | 4 +- + kernel/auditsc.c | 7 +- + kernel/events/core.c | 2 +- + kernel/taskstats.c | 2 +- + kernel/trace/trace.c | 4 +- + kernel/trace/trace_events.c | 2 +- + mm/memcontrol.c | 4 +- + security/commoncap.c | 2 +- + security/integrity/ima/ima_api.c | 4 +- + security/integrity/ima/ima_appraise.c | 4 +- + security/integrity/ima/ima_template_lib.c | 2 +- + security/selinux/selinuxfs.c | 6 +- + security/smack/smack_lsm.c | 8 +- + 119 files changed, 835 insertions(+), 1103 deletions(-) +Merging pci/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (351da0b20a0a Merge branch 'for-3.19/upstream' into for-next) +$ git merge hid/for-next +Removing drivers/hid/hid-logitech-dj.h +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 22 +- + drivers/hid/Makefile | 2 + + drivers/hid/hid-core.c | 23 +- + drivers/hid/hid-ids.h | 4 + + drivers/hid/hid-input.c | 2 +- + drivers/hid/hid-logitech-dj.c | 397 +++++++++--- + drivers/hid/hid-logitech-dj.h | 125 ---- + drivers/hid/hid-logitech-hidpp.c | 1237 ++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-plantronics.c | 55 ++ + drivers/hid/hid-roccat-kone.c | 9 +- + drivers/hid/hid-saitek.c | 4 +- + drivers/hid/usbhid/hid-core.c | 36 +- + drivers/hid/usbhid/usbhid.h | 1 + + include/linux/hid.h | 32 +- + 14 files changed, 1693 insertions(+), 256 deletions(-) + delete mode 100644 drivers/hid/hid-logitech-dj.h + create mode 100644 drivers/hid/hid-logitech-hidpp.c + create mode 100644 drivers/hid/hid-plantronics.c +Merging i2c/i2c/for-next (f114040e3ea6 Linux 3.18-rc1) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (ae530d4403e9 hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro) +$ git merge jdelvare-hwmon/master +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/hwmon/Kconfig +Merge made by the 'recursive' strategy. + drivers/hwmon/Kconfig | 10 +++ + drivers/hwmon/Makefile | 1 + + drivers/hwmon/i5500_temp.c | 149 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 160 insertions(+) + create mode 100644 drivers/hwmon/i5500_temp.c +Merging hwmon-staging/hwmon-next (efe8271c1e1b hwmon: (iio_hwmon) Add support for humidity sensors) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/ltc2978.txt | 39 +++++++ + drivers/hwmon/iio_hwmon.c | 7 +- + drivers/hwmon/pmbus/Kconfig | 11 +- + drivers/hwmon/pmbus/ltc2978.c | 39 ++++++- + drivers/hwmon/pmbus/pmbus.h | 30 ++++++ + drivers/hwmon/pmbus/pmbus_core.c | 118 +++++++++++++++++++++ + include/linux/i2c/pmbus.h | 4 + + 7 files changed, 244 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/ltc2978.txt +Merging v4l-dvb/master (0da19d032fb1 Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb/master +Removing drivers/staging/media/lirc/lirc_igorplugusb.c +Auto-merging drivers/media/platform/vim2m.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/DocBook/media/dvb/dvbproperty.xml | 4 +- + Documentation/DocBook/media/v4l/io.xml | 5 +- + Documentation/video4linux/CARDLIST.cx23885 | 2 + + Documentation/video4linux/CARDLIST.em28xx | 1 + + Documentation/video4linux/CARDLIST.saa7134 | 1 + + Documentation/video4linux/vivid.txt | 12 +- + MAINTAINERS | 13 + + drivers/media/common/saa7146/saa7146_core.c | 2 +- + drivers/media/common/tveeprom.c | 36 +- + drivers/media/dvb-core/dvb_frontend.c | 6 + + drivers/media/dvb-core/dvb_net.c | 4 +- + drivers/media/dvb-frontends/Kconfig | 5 +- + drivers/media/dvb-frontends/af9033.c | 117 ++- + drivers/media/dvb-frontends/af9033_priv.h | 11 +- + drivers/media/dvb-frontends/au8522_dig.c | 117 ++- + drivers/media/dvb-frontends/dib7000p.c | 9 +- + drivers/media/dvb-frontends/drxk_hard.c | 6 +- + drivers/media/dvb-frontends/ds3000.c | 7 + + drivers/media/dvb-frontends/m88ds3103.c | 242 +++-- + drivers/media/dvb-frontends/m88ds3103_priv.h | 181 ++++ + drivers/media/dvb-frontends/si2168.c | 3 +- + drivers/media/dvb-frontends/sp2.c | 25 +- + drivers/media/dvb-frontends/stv090x.c | 162 ++-- + drivers/media/dvb-frontends/tc90522.c | 18 +- + drivers/media/firewire/firedtv.h | 2 +- + drivers/media/i2c/cx25840/cx25840-firmware.c | 11 +- + drivers/media/i2c/smiapp-pll.c | 280 +++--- + drivers/media/i2c/smiapp-pll.h | 21 +- + drivers/media/i2c/smiapp/smiapp-core.c | 220 +++-- + drivers/media/i2c/smiapp/smiapp.h | 8 + + drivers/media/media-entity.c | 13 +- + drivers/media/pci/Kconfig | 1 + + drivers/media/pci/Makefile | 3 +- + drivers/media/pci/cx23885/cx23885-cards.c | 74 ++ + drivers/media/pci/cx23885/cx23885-dvb.c | 523 +++++++--- + drivers/media/pci/cx23885/cx23885-input.c | 22 + + drivers/media/pci/cx23885/cx23885.h | 4 + + drivers/media/pci/cx88/Kconfig | 5 +- + drivers/media/pci/cx88/Makefile | 1 - + drivers/media/pci/cx88/cx88-alsa.c | 112 ++- + drivers/media/pci/cx88/cx88-blackbird.c | 565 +++++------ + drivers/media/pci/cx88/cx88-cards.c | 71 +- + drivers/media/pci/cx88/cx88-core.c | 113 +-- + drivers/media/pci/cx88/cx88-dvb.c | 158 ++- + drivers/media/pci/cx88/cx88-mpeg.c | 159 +-- + drivers/media/pci/cx88/cx88-vbi.c | 216 ++--- + drivers/media/pci/cx88/cx88-video.c | 871 +++++------------ + drivers/media/pci/cx88/cx88.h | 104 +- + drivers/media/pci/pt1/pt1.c | 13 +- + drivers/media/pci/pt3/pt3.c | 75 +- + drivers/media/pci/smipcie/Kconfig | 13 + + drivers/media/pci/smipcie/Makefile | 6 + + drivers/media/pci/smipcie/smipcie.c | 1021 ++++++++++++++++++++ + drivers/media/pci/smipcie/smipcie.h | 299 ++++++ + drivers/media/platform/Kconfig | 4 +- + drivers/media/platform/Makefile | 2 +- + drivers/media/platform/coda/Makefile | 2 +- + drivers/media/platform/coda/coda-bit.c | 322 +++--- + drivers/media/platform/coda/coda-common.c | 607 ++++++++---- + drivers/media/platform/coda/coda-jpeg.c | 238 +++++ + drivers/media/platform/coda/coda.h | 24 +- + drivers/media/platform/coda/coda_regs.h | 7 + + drivers/media/platform/davinci/vpbe.c | 18 +- + drivers/media/platform/davinci/vpbe_display.c | 606 +++--------- + drivers/media/platform/s5p-mfc/regs-mfc-v6.h | 1 + + drivers/media/platform/s5p-mfc/s5p_mfc.c | 45 +- + drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 4 +- + drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 122 ++- + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 6 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 59 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 13 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 32 +- + drivers/media/platform/ti-vpe/csc.c | 8 +- + drivers/media/platform/ti-vpe/sc.c | 8 +- + .../media/platform/{mem2mem_testdev.c => vim2m.c} | 221 +++-- + drivers/media/platform/vivid/vivid-core.c | 11 +- + drivers/media/rc/Kconfig | 15 + + drivers/media/rc/Makefile | 1 + + drivers/media/rc/igorplugusb.c | 261 +++++ + drivers/media/rc/imon.c | 3 +- + drivers/media/rc/ir-hix5hd2.c | 2 +- + drivers/media/rc/ir-rc5-decoder.c | 2 +- + drivers/media/rc/rc-ir-raw.c | 1 - + drivers/media/rc/rc-main.c | 5 + + drivers/media/tuners/Kconfig | 8 + + drivers/media/tuners/Makefile | 1 + + drivers/media/tuners/m88rs6000t.c | 744 ++++++++++++++ + drivers/media/tuners/m88rs6000t.h | 29 + + drivers/media/tuners/m88ts2022.c | 2 + + drivers/media/tuners/si2157.c | 3 + + drivers/media/tuners/xc5000.c | 14 +- + drivers/media/tuners/xc5000.h | 1 + + drivers/media/usb/au0828/au0828-cards.c | 5 + + drivers/media/usb/au0828/au0828-dvb.c | 2 + + drivers/media/usb/cx231xx/Kconfig | 1 + + drivers/media/usb/cx231xx/cx231xx-417.c | 57 +- + drivers/media/usb/cx231xx/cx231xx-audio.c | 97 +- + drivers/media/usb/cx231xx/cx231xx-avcore.c | 331 ++++--- + drivers/media/usb/cx231xx/cx231xx-cards.c | 257 ++--- + drivers/media/usb/cx231xx/cx231xx-core.c | 165 ++-- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 159 +-- + drivers/media/usb/cx231xx/cx231xx-i2c.c | 132 ++- + drivers/media/usb/cx231xx/cx231xx-input.c | 8 +- + drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c | 47 +- + drivers/media/usb/cx231xx/cx231xx-vbi.c | 48 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 85 +- + drivers/media/usb/cx231xx/cx231xx.h | 41 +- + drivers/media/usb/dvb-usb-v2/Kconfig | 1 + + drivers/media/usb/dvb-usb-v2/dvbsky.c | 220 ++++- + drivers/media/usb/dvb-usb/af9005.c | 3 + + drivers/media/usb/dvb-usb/cxusb.c | 6 + + drivers/media/usb/em28xx/em28xx-cards.c | 16 + + drivers/media/usb/em28xx/em28xx-dvb.c | 5 +- + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 10 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 87 +- + drivers/staging/media/lirc/Kconfig | 6 - + drivers/staging/media/lirc/Makefile | 1 - + drivers/staging/media/lirc/lirc_igorplugusb.c | 508 ---------- + drivers/staging/media/lirc/lirc_imon.c | 10 +- + drivers/staging/media/lirc/lirc_sasem.c | 10 +- + drivers/staging/media/lirc/lirc_zilog.c | 2 +- + include/media/davinci/vpbe_display.h | 19 - + include/media/lirc_dev.h | 8 +- + sound/usb/quirks-table.h | 166 +--- + 125 files changed, 7479 insertions(+), 4460 deletions(-) + create mode 100644 drivers/media/pci/smipcie/Kconfig + create mode 100644 drivers/media/pci/smipcie/Makefile + create mode 100644 drivers/media/pci/smipcie/smipcie.c + create mode 100644 drivers/media/pci/smipcie/smipcie.h + create mode 100644 drivers/media/platform/coda/coda-jpeg.c + rename drivers/media/platform/{mem2mem_testdev.c => vim2m.c} (81%) + create mode 100644 drivers/media/rc/igorplugusb.c + create mode 100644 drivers/media/tuners/m88rs6000t.c + create mode 100644 drivers/media/tuners/m88rs6000t.h + delete mode 100644 drivers/staging/media/lirc/lirc_igorplugusb.c +Merging kbuild/for-next (e9f717fb534c Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/gcov/Kconfig +Auto-merging init/Kconfig +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/link-vmlinux.sh | 2 +- + 9 files changed, 356 insertions(+), 8 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto +Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (f9ca5ab832e7 libata-scsi: Update SATL for ZAC drives) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/sata_rcar.txt | 6 +- + drivers/ata/ahci.c | 28 +++++--- + drivers/ata/libahci.c | 78 +++++----------------- + drivers/ata/libata-core.c | 20 ++++-- + drivers/ata/libata-eh.c | 7 +- + drivers/ata/libata-scsi.c | 30 ++++++++- + drivers/ata/libata-transport.c | 1 + + drivers/ata/sata_rcar.c | 15 +++++ + drivers/scsi/aic94xx/aic94xx_task.c | 10 +-- + drivers/scsi/isci/request.c | 4 +- + drivers/scsi/libsas/sas_ata.c | 66 +++--------------- + drivers/scsi/mvsas/mv_sas.c | 4 +- + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- + include/linux/libata.h | 6 +- + include/scsi/libsas.h | 11 +-- + 16 files changed, 131 insertions(+), 159 deletions(-) +Merging pm/linux-next (f23b3d72491b Merge branch 'device-properties' into linux-next) +$ git merge pm/linux-next +Auto-merging arch/arm/plat-orion/gpio.c +Merge made by the 'recursive' strategy. + Documentation/acpi/gpio-properties.txt | 96 +++++ + Documentation/gpio/consumer.txt | 18 + + arch/arm/mach-s3c24xx/h1940-bluetooth.c | 4 +- + arch/arm/mach-s3c24xx/h1940.h | 4 +- + arch/arm/mach-s3c24xx/mach-h1940.c | 3 +- + arch/arm/mach-s3c24xx/mach-rx1950.c | 3 +- + arch/arm/plat-orion/gpio.c | 3 +- + arch/arm/plat-orion/include/plat/orion-gpio.h | 5 +- + drivers/acpi/Makefile | 1 + + drivers/acpi/blacklist.c | 8 + + drivers/acpi/internal.h | 6 + + drivers/acpi/property.c | 551 ++++++++++++++++++++++++++ + drivers/acpi/scan.c | 129 +++++- + drivers/acpi/video.c | 15 + + drivers/base/Makefile | 2 +- + drivers/base/property.c | 431 ++++++++++++++++++++ + drivers/gpio/devres.c | 32 ++ + drivers/gpio/gpio-sch.c | 293 ++++++-------- + drivers/gpio/gpiolib-acpi.c | 117 +++++- + drivers/gpio/gpiolib.c | 85 +++- + drivers/gpio/gpiolib.h | 7 +- + drivers/input/keyboard/gpio_keys_polled.c | 112 +++--- + drivers/leds/leds-gpio.c | 140 ++++--- + drivers/misc/eeprom/at25.c | 34 +- + drivers/of/base.c | 33 ++ + include/acpi/acpi_bus.h | 28 ++ + include/linux/acpi.h | 136 ++++++- + include/linux/gpio/consumer.h | 7 + + include/linux/gpio_keys.h | 3 + + include/linux/leds.h | 3 +- + include/linux/of.h | 34 ++ + include/linux/pm_domain.h | 2 +- + include/linux/property.h | 143 +++++++ + kernel/power/hibernate.c | 14 +- + kernel/power/power.h | 3 +- + kernel/power/snapshot.c | 9 +- + kernel/power/swap.c | 41 +- + net/rfkill/rfkill-gpio.c | 18 +- + 38 files changed, 2152 insertions(+), 421 deletions(-) + create mode 100644 Documentation/acpi/gpio-properties.txt + create mode 100644 drivers/acpi/property.c + create mode 100644 drivers/base/property.c + create mode 100644 include/linux/property.h +Merging idle/next (e7c95ff32d00 tools/power turbostat: tweak whitespace in output format) +$ git merge idle/next +Already up-to-date. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging thermal/next (6ceaf58abe25 Merge branch 'int340x-thermal' of .git into next) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (9404b15775ec Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. + drivers/thermal/Kconfig | 12 + + drivers/thermal/Makefile | 3 + + drivers/thermal/clock_cooling.c | 485 ++++++++++++++++++++++ + drivers/thermal/int340x_thermal/int3403_thermal.c | 8 +- + include/linux/clock_cooling.h | 65 +++ + 5 files changed, 572 insertions(+), 1 deletion(-) + create mode 100644 drivers/thermal/clock_cooling.c + create mode 100644 include/linux/clock_cooling.h +Merging ieee1394/for-next (19583ca584d6 Linux 3.16) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (c07127b48c63 dlm: fix missing endian conversion of rcom_status flags) +$ 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 (f114040e3ea6 Linux 3.18-rc1) +$ git merge slave-dma/next +Already up-to-date. +Merging net-next/master (25de4668d094 ipv6: move INET6_MATCH() to include/net/inet6_hashtables.h) +$ git merge net-next/master +Auto-merging net/irda/af_irda.c +Auto-merging net/ipv6/ip6_tunnel.c +Auto-merging net/ipv4/tcp_input.c +Auto-merging net/ipv4/geneve.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/ethernet/apm/xgene/xgene_enet_main.c +Auto-merging MAINTAINERS +Auto-merging Documentation/networking/ip-sysctl.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/dsa/dsa.txt | 9 +- + Documentation/networking/bonding.txt | 7 +- + Documentation/networking/ip-sysctl.txt | 23 +- + MAINTAINERS | 5 + + arch/arm/mach-mmp/gplugd.c | 1 + + arch/powerpc/include/asm/ppc-opcode.h | 1 + + arch/powerpc/net/bpf_jit.h | 7 + + arch/powerpc/net/bpf_jit_comp.c | 5 + + drivers/isdn/mISDN/socket.c | 2 +- + drivers/net/bonding/bond_alb.c | 2 +- + drivers/net/bonding/bond_main.c | 15 +- + drivers/net/bonding/bonding.h | 6 + + drivers/net/dsa/Kconfig | 9 + + drivers/net/dsa/Makefile | 3 + + drivers/net/dsa/mv88e6060.c | 5 +- + drivers/net/dsa/mv88e6123_61_65.c | 73 +- + drivers/net/dsa/mv88e6131.c | 12 +- + drivers/net/dsa/mv88e6352.c | 788 +++++++ + drivers/net/dsa/mv88e6xxx.c | 53 +- + drivers/net/dsa/mv88e6xxx.h | 15 + + drivers/net/ethernet/3com/typhoon.c | 4 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 12 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/cirrus/mac89x0.c | 8 +- + drivers/net/ethernet/freescale/gianfar.c | 63 +- + drivers/net/ethernet/freescale/gianfar.h | 38 +- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 7 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 2139 ++++++++++---------- + drivers/net/ethernet/intel/i40e/i40e_common.c | 28 + + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 93 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 35 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 173 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 2 + + drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +- + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 2136 ++++++++++--------- + drivers/net/ethernet/intel/i40evf/i40e_common.c | 1 + + drivers/net/ethernet/intel/i40evf/i40e_type.h | 1 + + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 8 +- + drivers/net/ethernet/marvell/mvneta.c | 3 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 254 +-- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 13 +- + drivers/net/ethernet/mellanox/mlx4/en_clock.c | 46 - + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 503 ++++- + drivers/net/ethernet/mellanox/mlx4/en_main.c | 12 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 126 +- + drivers/net/ethernet/mellanox/mlx4/en_port.c | 24 +- + drivers/net/ethernet/mellanox/mlx4/en_port.h | 35 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 28 +- + drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 12 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 237 ++- + drivers/net/ethernet/mellanox/mlx4/main.c | 9 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 10 + + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 19 +- + drivers/net/ethernet/mellanox/mlx4/port.c | 156 ++ + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 17 + + drivers/net/ethernet/natsemi/macsonic.c | 4 - + drivers/net/ethernet/realtek/atp.h | 246 +-- + drivers/net/ethernet/renesas/sh_eth.c | 8 +- + .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 3 - + drivers/net/ethernet/stmicro/stmmac/Kconfig | 68 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 8 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 4 - + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 9 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 14 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 10 +- + drivers/net/ethernet/sun/sunvnet.c | 346 ++-- + drivers/net/ethernet/sun/sunvnet.h | 8 +- + drivers/net/ethernet/wiznet/w5100.c | 6 +- + drivers/net/ethernet/wiznet/w5300.c | 6 +- + drivers/net/hamradio/6pack.c | 3 +- + drivers/net/hyperv/netvsc_drv.c | 4 +- + drivers/net/hyperv/rndis_filter.c | 3 +- + drivers/net/phy/marvell.c | 52 +- + drivers/net/phy/spi_ks8995.c | 4 +- + drivers/net/ppp/pppoe.c | 2 +- + drivers/net/usb/r8152.c | 40 +- + drivers/net/xen-netback/interface.c | 2 +- + drivers/net/xen-netback/netback.c | 2 +- + drivers/net/xen-netfront.c | 253 +-- + drivers/s390/net/Kconfig | 2 +- + drivers/s390/net/ctcm_sysfs.c | 8 +- + drivers/s390/net/lcs.c | 11 +- + drivers/s390/net/qeth_core.h | 16 - + drivers/s390/net/qeth_core_main.c | 24 +- + drivers/s390/net/qeth_l2_main.c | 2 +- + drivers/s390/net/qeth_l3.h | 4 - + drivers/s390/net/qeth_l3_main.c | 10 +- + include/linux/ipv6.h | 11 +- + include/linux/marvell_phy.h | 1 + + include/linux/mlx4/cmd.h | 31 + + include/linux/mlx4/device.h | 72 +- + include/linux/netdev_features.h | 4 +- + include/linux/netdevice.h | 29 +- + include/linux/pxa168_eth.h | 3 + + include/linux/skbuff.h | 30 +- + include/linux/tcp.h | 4 +- + include/net/dsa.h | 33 + + include/net/fou.h | 38 + + include/net/gue.h | 103 +- + include/net/inet6_hashtables.h | 10 + + include/net/ipx.h | 3 + + include/net/neighbour.h | 3 +- + include/net/netlink.h | 10 + + include/net/sctp/structs.h | 1 - + include/net/tcp.h | 25 +- + include/uapi/linux/ethtool.h | 18 +- + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/if_tunnel.h | 1 + + include/uapi/linux/ipv6.h | 1 + + kernel/bpf/verifier.c | 101 +- + lib/test_bpf.c | 43 + + net/appletalk/ddp.c | 2 +- + net/atm/common.c | 2 +- + net/ax25/af_ax25.c | 2 +- + net/bluetooth/af_bluetooth.c | 4 +- + net/bluetooth/hci_sock.c | 2 +- + net/bridge/br_forward.c | 5 + + net/bridge/br_input.c | 60 + + net/bridge/br_netlink.c | 4 +- + net/bridge/br_private.h | 1 + + net/bridge/br_sysfs_if.c | 2 + + net/caif/caif_socket.c | 2 +- + net/core/dev.c | 83 +- + net/core/neighbour.c | 32 +- + net/core/skbuff.c | 14 +- + net/core/sock.c | 2 +- + net/dccp/proto.c | 2 +- + net/dsa/Kconfig | 11 + + net/dsa/dsa.c | 135 ++ + net/dsa/slave.c | 64 + + net/dsa/tag_dsa.c | 2 - + net/dsa/tag_edsa.c | 2 - + net/dsa/tag_trailer.c | 2 - + net/ieee802154/dgram.c | 2 +- + net/ieee802154/raw.c | 2 +- + net/ipv4/Kconfig | 9 + + net/ipv4/af_inet.c | 1 + + net/ipv4/cipso_ipv4.c | 8 +- + net/ipv4/esp4.c | 4 +- + net/ipv4/fou.c | 388 +++- + net/ipv4/geneve.c | 2 +- + net/ipv4/igmp.c | 28 +- + net/ipv4/ip_fragment.c | 16 +- + net/ipv4/ip_sockglue.c | 2 +- + net/ipv4/ip_tunnel.c | 61 +- + net/ipv4/ipconfig.c | 19 +- + net/ipv4/ping.c | 2 +- + net/ipv4/proc.c | 6 +- + net/ipv4/raw.c | 2 +- + net/ipv4/syncookies.c | 86 +- + net/ipv4/sysctl_net_ipv4.c | 7 + + net/ipv4/tcp.c | 5 +- + net/ipv4/tcp_cong.c | 2 +- + net/ipv4/tcp_input.c | 32 +- + net/ipv4/tcp_offload.c | 1 + + net/ipv4/tcp_output.c | 13 +- + net/ipv4/udp.c | 15 +- + net/ipv4/udp_offload.c | 66 +- + net/ipv6/addrconf.c | 50 +- + net/ipv6/datagram.c | 4 +- + net/ipv6/exthdrs.c | 2 +- + net/ipv6/icmp.c | 1 - + net/ipv6/ip6_flowlabel.c | 4 +- + net/ipv6/ip6_offload.c | 1 + + net/ipv6/ip6_tunnel.c | 32 +- + net/ipv6/ip6mr.c | 2 +- + net/ipv6/raw.c | 7 +- + net/ipv6/reassembly.c | 12 +- + net/ipv6/route.c | 94 +- + net/ipv6/syncookies.c | 13 +- + net/ipv6/udp.c | 4 +- + net/ipv6/udp_offload.c | 1 + + net/ipx/af_ipx.c | 5 +- + net/ipx/ipx_proc.c | 18 +- + net/ipx/sysctl_net_ipx.c | 4 +- + net/irda/af_irda.c | 2 +- + net/iucv/af_iucv.c | 2 +- + net/key/af_key.c | 2 +- + net/l2tp/l2tp_ip.c | 2 +- + net/l2tp/l2tp_ip6.c | 2 +- + net/l2tp/l2tp_ppp.c | 2 +- + net/lapb/lapb_iface.c | 17 +- + net/llc/af_llc.c | 3 +- + net/llc/llc_if.c | 2 +- + net/netlink/af_netlink.c | 2 +- + net/netrom/af_netrom.c | 2 +- + net/nfc/llcp_sock.c | 2 +- + net/nfc/rawsock.c | 2 +- + net/openvswitch/Kconfig | 18 +- + net/openvswitch/Makefile | 14 +- + net/openvswitch/actions.c | 11 +- + net/openvswitch/datapath.c | 17 +- + net/openvswitch/vport-geneve.c | 23 +- + net/openvswitch/vport-gre.c | 23 +- + net/openvswitch/vport-internal_dev.c | 17 +- + net/openvswitch/vport-netdev.c | 14 +- + net/openvswitch/vport-netdev.h | 3 + + net/openvswitch/vport-vxlan.c | 23 +- + net/openvswitch/vport.c | 102 +- + net/openvswitch/vport.h | 14 +- + net/packet/af_packet.c | 2 +- + net/phonet/datagram.c | 2 +- + net/phonet/pep.c | 2 +- + net/rose/af_rose.c | 2 +- + net/rxrpc/ar-recvmsg.c | 2 +- + net/sched/sch_netem.c | 27 +- + net/sctp/proc.c | 12 +- + net/sctp/socket.c | 2 +- + net/tipc/msg.c | 4 +- + net/tipc/socket.c | 9 +- + net/unix/af_unix.c | 6 +- + net/vmw_vsock/vmci_transport.c | 3 +- + net/x25/af_x25.c | 2 +- + samples/bpf/test_verifier.c | 46 +- + 217 files changed, 7121 insertions(+), 3851 deletions(-) + create mode 100644 drivers/net/dsa/mv88e6352.c + create mode 100644 include/net/fou.h +Merging ipsec-next/master (f293a5e33e08 xfrm: add XFRMA_REPLAY_VAL attribute to SA messages) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_policy.c +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_policy.c | 3 +-- + net/xfrm/xfrm_user.c | 12 ++++++++---- + 2 files changed, 9 insertions(+), 6 deletions(-) +Merging wireless-next/master (bf515fb11ab5 Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next) +$ git merge wireless-next/master +Removing net/mac802154/wpan.c +Removing net/mac802154/monitor.c +Auto-merging net/mac802154/ieee802154_i.h +Removing net/mac802154/ieee802154_dev.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/iface.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/ieee802154/raw.c +Auto-merging net/ieee802154/dgram.c +Auto-merging net/ieee802154/core.c +Auto-merging net/bluetooth/hci_sock.c +Auto-merging include/net/cfg802154.h +Auto-merging include/linux/ieee802154.h +Auto-merging drivers/net/wireless/rtlwifi/rtl8821ae/phy.c +Auto-merging drivers/net/wireless/mwifiex/main.h +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/wireless/iwlwifi/pcie/trans.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/ops.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/mvm.h +Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c +Removing drivers/net/wireless/brcm80211/brcmfmac/usb_rdl.h +Auto-merging drivers/net/wireless/brcm80211/brcmfmac/sdio.h +Auto-merging drivers/net/wireless/brcm80211/brcmfmac/sdio.c +Removing drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c +Auto-merging drivers/net/wireless/brcm80211/brcmfmac/debug.h +Auto-merging drivers/net/wireless/brcm80211/brcmfmac/debug.c +Auto-merging drivers/net/wireless/brcm80211/brcmfmac/core.h +Auto-merging drivers/net/wireless/brcm80211/brcmfmac/core.c +Auto-merging drivers/net/wireless/brcm80211/brcmfmac/cfg80211.h +Auto-merging drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c +Auto-merging drivers/net/wireless/brcm80211/brcmfmac/bus.h +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging drivers/net/wireless/ath/ath9k/init.c +Auto-merging drivers/net/wireless/ath/ath9k/debug.c +Auto-merging drivers/net/wireless/ath/ath.h +Removing drivers/net/ieee802154/fakehard.c +Auto-merging drivers/bcma/main.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 15 + + drivers/bcma/bcma_private.h | 1 + + drivers/bcma/main.c | 9 +- + drivers/bcma/scan.c | 1 + + drivers/bluetooth/ath3k.c | 2 + + drivers/bluetooth/btusb.c | 1 + + drivers/bluetooth/hci_h5.c | 34 + + drivers/net/ieee802154/Kconfig | 10 - + drivers/net/ieee802154/Makefile | 1 - + drivers/net/ieee802154/at86rf230.c | 392 +++---- + drivers/net/ieee802154/cc2520.c | 70 +- + drivers/net/ieee802154/fakehard.c | 427 -------- + drivers/net/ieee802154/fakelb.c | 92 +- + drivers/net/ieee802154/mrf24j40.c | 104 +- + drivers/net/wireless/ath/ath.h | 2 +- + drivers/net/wireless/ath/ath10k/ce.c | 83 +- + drivers/net/wireless/ath/ath10k/ce.h | 21 +- + drivers/net/wireless/ath/ath10k/core.c | 111 +- + drivers/net/wireless/ath/ath10k/core.h | 82 +- + drivers/net/wireless/ath/ath10k/debug.c | 891 ++++++++++++---- + drivers/net/wireless/ath/ath10k/debug.h | 40 +- + drivers/net/wireless/ath/ath10k/hif.h | 10 + + drivers/net/wireless/ath/ath10k/htt.h | 2 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 20 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 2 + + drivers/net/wireless/ath/ath10k/hw.h | 17 +- + drivers/net/wireless/ath/ath10k/mac.c | 517 +++++---- + drivers/net/wireless/ath/ath10k/mac.h | 1 + + drivers/net/wireless/ath/ath10k/pci.c | 203 ++-- + drivers/net/wireless/ath/ath10k/spectral.c | 34 +- + drivers/net/wireless/ath/ath10k/spectral.h | 8 +- + drivers/net/wireless/ath/ath10k/trace.h | 163 +++ + drivers/net/wireless/ath/ath10k/txrx.c | 1 + + drivers/net/wireless/ath/ath10k/wmi.c | 1116 +++++++++++--------- + drivers/net/wireless/ath/ath10k/wmi.h | 273 ++--- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +- + drivers/net/wireless/ath/ath6kl/common.h | 2 +- + drivers/net/wireless/ath/ath6kl/debug.c | 28 +- + drivers/net/wireless/ath/ath6kl/debug.h | 13 +- + drivers/net/wireless/ath/ath9k/Kconfig | 5 + + drivers/net/wireless/ath/ath9k/Makefile | 3 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 7 +- + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 42 +- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 11 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 3 - + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 7 +- + drivers/net/wireless/ath/ath9k/ar9003_rtt.h | 36 + + .../net/wireless/ath/ath9k/ar955x_1p0_initvals.h | 8 +- + .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 144 ++- + drivers/net/wireless/ath/ath9k/ath9k.h | 15 +- + drivers/net/wireless/ath/ath9k/calib.c | 6 +- + drivers/net/wireless/ath/ath9k/calib.h | 2 +- + drivers/net/wireless/ath/ath9k/channel.c | 319 ++++-- + drivers/net/wireless/ath/ath9k/debug.c | 49 +- + drivers/net/wireless/ath/ath9k/debug.h | 1 + + drivers/net/wireless/ath/ath9k/eeprom_def.c | 31 +- + drivers/net/wireless/ath/ath9k/hw-ops.h | 7 +- + drivers/net/wireless/ath/ath9k/hw.c | 43 +- + drivers/net/wireless/ath/ath9k/hw.h | 26 +- + drivers/net/wireless/ath/ath9k/init.c | 7 + + drivers/net/wireless/ath/ath9k/link.c | 12 +- + drivers/net/wireless/ath/ath9k/main.c | 200 +++- + drivers/net/wireless/ath/ath9k/pci.c | 6 + + drivers/net/wireless/ath/ath9k/reg.h | 33 +- + drivers/net/wireless/ath/ath9k/tx99.c | 4 +- + drivers/net/wireless/ath/carl9170/phy.c | 4 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 5 +- + drivers/net/wireless/ath/wil6210/main.c | 95 +- + drivers/net/wireless/ath/wil6210/netdev.c | 2 +- + drivers/net/wireless/ath/wil6210/txrx.c | 7 +- + drivers/net/wireless/ath/wil6210/txrx.h | 4 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 13 +- + drivers/net/wireless/ath/wil6210/wmi.c | 4 +- + drivers/net/wireless/brcm80211/brcmfmac/Makefile | 10 +- + drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | 6 +- + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 51 +- + drivers/net/wireless/brcm80211/brcmfmac/btcoex.c | 6 +- + .../brcm80211/brcmfmac/{dhd_bus.h => bus.h} | 11 +- + .../brcmfmac/{wl_cfg80211.c => cfg80211.c} | 85 +- + .../brcmfmac/{wl_cfg80211.h => cfg80211.h} | 9 +- + drivers/net/wireless/brcm80211/brcmfmac/chip.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/common.c | 168 +++ + .../net/wireless/brcm80211/brcmfmac/commonring.c | 2 +- + .../brcm80211/brcmfmac/{dhd_linux.c => core.c} | 8 +- + .../wireless/brcm80211/brcmfmac/{dhd.h => core.h} | 7 +- + .../brcm80211/brcmfmac/{dhd_dbg.c => debug.c} | 6 +- + .../brcm80211/brcmfmac/{dhd_dbg.h => debug.h} | 6 +- + .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 400 ------- + drivers/net/wireless/brcm80211/brcmfmac/feature.c | 11 +- + drivers/net/wireless/brcm80211/brcmfmac/firmware.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/flowring.c | 6 +- + drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 4 +- + drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 84 +- + .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 89 +- + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 8 +- + drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 6 +- + drivers/net/wireless/brcm80211/brcmfmac/of.c | 4 +- + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 6 +- + drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 4 +- + drivers/net/wireless/brcm80211/brcmfmac/proto.c | 6 +- + .../brcm80211/brcmfmac/{dhd_sdio.c => sdio.c} | 55 +- + .../brcm80211/brcmfmac/{sdio_host.h => sdio.h} | 8 +- + .../net/wireless/brcm80211/brcmfmac/tracepoint.c | 15 + + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 142 ++- + drivers/net/wireless/brcm80211/brcmfmac/usb_rdl.h | 75 -- + drivers/net/wireless/brcm80211/brcmfmac/vendor.c | 6 +- + drivers/net/wireless/brcm80211/brcmsmac/debug.c | 166 ++- + drivers/net/wireless/brcm80211/brcmsmac/main.c | 18 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/ipw2x00/libipw.h | 5 - + drivers/net/wireless/ipw2x00/libipw_module.c | 15 +- + drivers/net/wireless/ipw2x00/libipw_rx.c | 21 +- + drivers/net/wireless/iwlegacy/4965-mac.c | 2 +- + drivers/net/wireless/iwlegacy/4965.h | 5 +- + drivers/net/wireless/iwlwifi/Kconfig | 1 + + drivers/net/wireless/iwlwifi/dvm/lib.c | 4 +- + drivers/net/wireless/iwlwifi/dvm/mac80211.c | 1 + + drivers/net/wireless/iwlwifi/iwl-8000.c | 1 + + drivers/net/wireless/iwlwifi/iwl-config.h | 12 + + drivers/net/wireless/iwlwifi/iwl-drv.c | 3 - + drivers/net/wireless/iwlwifi/iwl-fw.h | 1 - + drivers/net/wireless/iwlwifi/iwl-trans.h | 4 - + drivers/net/wireless/iwlwifi/mvm/coex.c | 13 +- + drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 14 +- + drivers/net/wireless/iwlwifi/mvm/constants.h | 5 + + drivers/net/wireless/iwlwifi/mvm/d3.c | 318 +++--- + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 201 ++-- + drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 5 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 120 ++- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 18 +- + drivers/net/wireless/iwlwifi/mvm/ops.c | 15 +- + drivers/net/wireless/iwlwifi/mvm/rs.c | 80 +- + drivers/net/wireless/iwlwifi/mvm/rs.h | 2 + + drivers/net/wireless/iwlwifi/mvm/scan.c | 35 +- + drivers/net/wireless/iwlwifi/mvm/sta.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/tt.c | 4 - + drivers/net/wireless/iwlwifi/mvm/tx.c | 6 +- + drivers/net/wireless/iwlwifi/mvm/utils.c | 37 + + drivers/net/wireless/iwlwifi/pcie/trans.c | 45 +- + drivers/net/wireless/mac80211_hwsim.c | 462 ++++++-- + drivers/net/wireless/mac80211_hwsim.h | 25 +- + drivers/net/wireless/mwifiex/cfg80211.c | 75 +- + drivers/net/wireless/mwifiex/decl.h | 10 + + drivers/net/wireless/mwifiex/fw.h | 16 + + drivers/net/wireless/mwifiex/main.c | 6 + + drivers/net/wireless/mwifiex/main.h | 6 +- + drivers/net/wireless/mwifiex/scan.c | 76 +- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 10 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00usb.h | 39 +- + drivers/net/wireless/rtlwifi/rtl8821ae/phy.c | 12 +- + drivers/net/wireless/ti/wlcore/main.c | 23 +- + drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 4 +- + include/linux/ath9k_platform.h | 3 + + include/linux/ieee80211.h | 22 +- + include/{net => linux}/ieee802154.h | 23 +- + include/linux/nl802154.h | 4 - + include/net/6lowpan.h | 12 +- + include/net/af_ieee802154.h | 4 - + include/net/bluetooth/hci_core.h | 8 +- + include/net/cfg80211.h | 84 +- + include/net/{wpan-phy.h => cfg802154.h} | 22 +- + include/net/ieee802154_netdev.h | 6 +- + include/net/mac80211.h | 138 ++- + include/net/mac802154.h | 124 ++- + include/net/nl802154.h | 4 - + include/uapi/linux/nl80211.h | 32 +- + net/6lowpan/iphc.c | 71 +- + net/bluetooth/6lowpan.c | 284 +++-- + net/bluetooth/hci_conn.c | 14 +- + net/bluetooth/hci_core.c | 16 +- + net/bluetooth/hci_event.c | 50 +- + net/bluetooth/hci_sock.c | 2 +- + net/bluetooth/l2cap_core.c | 7 +- + net/bluetooth/mgmt.c | 83 +- + net/bluetooth/rfcomm/core.c | 6 +- + net/bluetooth/smp.c | 34 +- + net/ieee802154/6lowpan_rtnl.c | 108 +- + net/ieee802154/Makefile | 4 +- + net/ieee802154/af802154.h | 4 - + net/ieee802154/af_ieee802154.c | 4 - + net/ieee802154/{wpan-class.c => core.c} | 79 +- + net/ieee802154/dgram.c | 6 +- + net/ieee802154/header_ops.c | 3 +- + net/ieee802154/ieee802154.h | 4 - + net/ieee802154/netlink.c | 4 - + net/ieee802154/nl-mac.c | 27 +- + net/ieee802154/nl-phy.c | 6 +- + net/ieee802154/nl_policy.c | 4 - + net/ieee802154/raw.c | 4 - + net/ieee802154/reassembly.c | 8 +- + net/ieee802154/reassembly.h | 4 +- + net/ieee802154/sysfs.c | 94 ++ + net/ieee802154/sysfs.h | 9 + + net/mac80211/Kconfig | 18 + + net/mac80211/Makefile | 3 +- + net/mac80211/agg-tx.c | 5 - + net/mac80211/cfg.c | 178 +++- + net/mac80211/chan.c | 5 +- + net/mac80211/debug.h | 10 + + net/mac80211/debugfs_key.c | 12 +- + net/mac80211/driver-ops.h | 74 +- + net/mac80211/ieee80211_i.h | 80 +- + net/mac80211/iface.c | 30 +- + net/mac80211/key.c | 11 +- + net/mac80211/main.c | 38 +- + net/mac80211/mesh.h | 3 + + net/mac80211/mesh_pathtbl.c | 31 + + net/mac80211/mlme.c | 281 ++++- + net/mac80211/ocb.c | 250 +++++ + net/mac80211/rc80211_minstrel.c | 2 +- + net/mac80211/rc80211_minstrel_ht.c | 313 ++++-- + net/mac80211/rc80211_minstrel_ht.h | 40 +- + net/mac80211/rc80211_minstrel_ht_debugfs.c | 43 +- + net/mac80211/rx.c | 35 + + net/mac80211/sta_info.c | 4 +- + net/mac80211/status.c | 3 +- + net/mac80211/tdls.c | 8 +- + net/mac80211/trace.h | 100 +- + net/mac80211/tx.c | 15 + + net/mac80211/util.c | 132 ++- + net/mac80211/wep.c | 2 - + net/mac80211/wme.c | 33 +- + net/mac80211/wme.h | 2 - + net/mac80211/wpa.c | 5 - + net/mac802154/Kconfig | 2 +- + net/mac802154/Makefile | 4 +- + net/mac802154/driver-ops.h | 226 ++++ + net/mac802154/ieee802154_dev.c | 415 -------- + net/mac802154/{mac802154.h => ieee802154_i.h} | 87 +- + net/mac802154/iface.c | 466 ++++++++ + net/mac802154/llsec.c | 4 +- + net/mac802154/mac_cmd.c | 36 +- + net/mac802154/main.c | 265 +++++ + net/mac802154/mib.c | 240 ++--- + net/mac802154/monitor.c | 117 -- + net/mac802154/rx.c | 311 ++++-- + net/mac802154/tx.c | 154 +-- + net/mac802154/util.c | 55 + + net/mac802154/wpan.c | 599 ----------- + net/wireless/Makefile | 2 +- + net/wireless/chan.c | 10 +- + net/wireless/core.c | 77 +- + net/wireless/core.h | 12 + + net/wireless/nl80211.c | 196 +++- + net/wireless/ocb.c | 88 ++ + net/wireless/rdev-ops.h | 55 +- + net/wireless/sme.c | 13 +- + net/wireless/trace.h | 97 +- + net/wireless/util.c | 5 +- + 251 files changed, 9982 insertions(+), 5968 deletions(-) + delete mode 100644 drivers/net/ieee802154/fakehard.c + rename drivers/net/wireless/brcm80211/brcmfmac/{dhd_bus.h => bus.h} (98%) + rename drivers/net/wireless/brcm80211/brcmfmac/{wl_cfg80211.c => cfg80211.c} (98%) + rename drivers/net/wireless/brcm80211/brcmfmac/{wl_cfg80211.h => cfg80211.h} (98%) + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/common.c + rename drivers/net/wireless/brcm80211/brcmfmac/{dhd_linux.c => core.c} (99%) + rename drivers/net/wireless/brcm80211/brcmfmac/{dhd.h => core.h} (98%) + rename drivers/net/wireless/brcm80211/brcmfmac/{dhd_dbg.c => debug.c} (98%) + rename drivers/net/wireless/brcm80211/brcmfmac/{dhd_dbg.h => debug.h} (98%) + delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c + rename drivers/net/wireless/brcm80211/brcmfmac/{dhd_sdio.c => sdio.c} (98%) + rename drivers/net/wireless/brcm80211/brcmfmac/{sdio_host.h => sdio.h} (98%) + delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/usb_rdl.h + rename include/{net => linux}/ieee802154.h (94%) + rename include/net/{wpan-phy.h => cfg802154.h} (77%) + rename net/ieee802154/{wpan-class.c => core.c} (60%) + create mode 100644 net/ieee802154/sysfs.c + create mode 100644 net/ieee802154/sysfs.h + create mode 100644 net/mac80211/ocb.c + create mode 100644 net/mac802154/driver-ops.h + delete mode 100644 net/mac802154/ieee802154_dev.c + rename net/mac802154/{mac802154.h => ieee802154_i.h} (73%) + create mode 100644 net/mac802154/iface.c + create mode 100644 net/mac802154/main.c + delete mode 100644 net/mac802154/monitor.c + create mode 100644 net/mac802154/util.c + delete mode 100644 net/mac802154/wpan.c + create mode 100644 net/wireless/ocb.c +Merging bluetooth/master (0916c02205ed mac802154: fix typo promisuous to promiscuous) +$ git merge bluetooth/master +Removing include/net/nl802154.h +Auto-merging include/linux/netdevice.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + drivers/bluetooth/btusb.c | 7 +- + drivers/bluetooth/hci_h5.c | 13 +-- + drivers/net/ieee802154/at86rf230.c | 15 ++- + drivers/net/ieee802154/cc2520.c | 1 + + include/linux/ieee802154.h | 32 ++++++ + include/linux/netdevice.h | 3 + + include/net/bluetooth/hci.h | 15 +++ + include/net/bluetooth/hci_core.h | 21 ++++ + include/net/cfg802154.h | 24 +++-- + include/net/ieee802154_netdev.h | 12 --- + include/net/mac802154.h | 33 ++++++ + include/net/nl802154.h | 122 ---------------------- + net/6lowpan/iphc.c | 10 +- + net/bluetooth/Kconfig | 20 +++- + net/bluetooth/bnep/Kconfig | 2 +- + net/bluetooth/cmtp/Kconfig | 2 +- + net/bluetooth/hci_core.c | 72 +++++++------ + net/bluetooth/hci_event.c | 14 +++ + net/bluetooth/hidp/Kconfig | 2 +- + net/bluetooth/mgmt.c | 56 ++++++---- + net/bluetooth/rfcomm/Kconfig | 2 +- + net/bluetooth/rfcomm/core.c | 6 +- + net/ieee802154/6lowpan_rtnl.c | 22 ---- + net/ieee802154/core.c | 64 ++++++------ + net/ieee802154/core.h | 29 ++++++ + net/ieee802154/nl-mac.c | 203 ++++--------------------------------- + net/ieee802154/nl-phy.c | 23 ++--- + net/ieee802154/rdev-ops.h | 23 +++++ + net/ieee802154/sysfs.c | 16 ++- + net/mac802154/Makefile | 2 +- + net/mac802154/cfg.c | 47 +++++++++ + net/mac802154/cfg.h | 9 ++ + net/mac802154/ieee802154_i.h | 17 +++- + net/mac802154/iface.c | 195 ++++++++++++++++++++++------------- + net/mac802154/mac_cmd.c | 42 ++++---- + net/mac802154/main.c | 102 +++---------------- + net/mac802154/mib.c | 71 ------------- + net/mac802154/rx.c | 4 +- + 39 files changed, 619 insertions(+), 735 deletions(-) + delete mode 100644 include/net/nl802154.h + create mode 100644 net/ieee802154/core.h + create mode 100644 net/ieee802154/rdev-ops.h + create mode 100644 net/mac802154/cfg.c + create mode 100644 net/mac802154/cfg.h +Merging infiniband/for-next (7b909bb49ac2 Merge branches 'core', 'cxgb4', 'iser', 'mlx5' and 'ocrdma' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (89cf38dd536a mtd: cfi_cmdset_0001.c: fix resume for LH28F640BF chips) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (abb1cd00e6b7 mtd: atmel_nand: make PMECC lookup table and offset property optional) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/atmel-nand.txt | 6 +- + .../devicetree/bindings/mtd/diskonchip.txt | 15 + + .../devicetree/bindings/mtd/gpio-control-nand.txt | 14 +- + .../devicetree/bindings/mtd/sunxi-nand.txt | 45 + + drivers/mtd/Kconfig | 2 +- + drivers/mtd/bcm47xxpart.c | 28 +- + drivers/mtd/devices/docg3.c | 122 +- + drivers/mtd/devices/m25p80.c | 14 +- + drivers/mtd/devices/mtd_dataflash.c | 6 +- + drivers/mtd/devices/phram.c | 2 +- + drivers/mtd/inftlmount.c | 2 +- + drivers/mtd/maps/bfin-async-flash.c | 1 - + drivers/mtd/nand/Kconfig | 12 +- + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/atmel_nand.c | 81 +- + drivers/mtd/nand/atmel_nand_ecc.h | 4 + + drivers/mtd/nand/gpio.c | 4 +- + drivers/mtd/nand/mxc_nand.c | 10 +- + drivers/mtd/nand/nand_base.c | 4 +- + drivers/mtd/nand/nandsim.c | 42 +- + drivers/mtd/nand/omap2.c | 17 +- + drivers/mtd/nand/orion_nand.c | 39 +- + drivers/mtd/nand/sunxi_nand.c | 1432 ++++++++++++++++++++ + drivers/mtd/spi-nor/fsl-quadspi.c | 18 +- + drivers/mtd/spi-nor/spi-nor.c | 147 +- + fs/jffs2/summary.c | 1 + + include/linux/mtd/spi-nor.h | 11 +- + 27 files changed, 1813 insertions(+), 267 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/diskonchip.txt + create mode 100644 Documentation/devicetree/bindings/mtd/sunxi-nand.txt + create mode 100644 drivers/mtd/nand/sunxi_nand.c +Merging crypto/master (bac68f2c9a43 crypto: caam - add support for rfc4106(gcm(aes))) +$ git merge crypto/master +Auto-merging drivers/crypto/qat/qat_dh895xcc/adf_isr.c +Auto-merging drivers/crypto/qat/qat_common/qat_algs.c +Merge made by the 'recursive' strategy. + crypto/drbg.c | 79 ++- + crypto/testmgr.c | 3 +- + drivers/char/hw_random/core.c | 12 +- + drivers/crypto/caam/caamalg.c | 771 +++++++++++++++++++++++++++- + drivers/crypto/qat/qat_common/adf_aer.c | 2 +- + drivers/crypto/qat/qat_common/adf_dev_mgr.c | 6 +- + drivers/crypto/qat/qat_common/qat_algs.c | 1 - + drivers/crypto/qat/qat_dh895xcc/adf_isr.c | 12 +- + 8 files changed, 798 insertions(+), 88 deletions(-) +Merging drm/drm-next (041df3573d0c Merge tag 'drm-intel-next-2014-10-24' of git://anongit.freedesktop.org/drm-intel into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 33 + + arch/x86/kernel/early-quirks.c | 23 + + drivers/char/agp/intel-gtt.c | 4 - + drivers/gpu/drm/i915/Makefile | 6 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 11 +- + drivers/gpu/drm/i915/i915_debugfs.c | 48 +- + drivers/gpu/drm/i915/i915_dma.c | 41 +- + drivers/gpu/drm/i915/i915_drv.c | 255 +++-- + drivers/gpu/drm/i915/i915_drv.h | 106 ++- + drivers/gpu/drm/i915/i915_gem.c | 125 +-- + drivers/gpu/drm/i915/i915_gem_gtt.c | 36 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 41 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 13 +- + drivers/gpu/drm/i915/i915_ioc32.c | 2 - + drivers/gpu/drm/i915/i915_irq.c | 634 ++++--------- + drivers/gpu/drm/i915/i915_reg.h | 207 ++++- + drivers/gpu/drm/i915/i915_sysfs.c | 22 +- + drivers/gpu/drm/i915/intel_bios.h | 10 +- + drivers/gpu/drm/i915/intel_crt.c | 4 +- + drivers/gpu/drm/i915/intel_ddi.c | 54 +- + drivers/gpu/drm/i915/intel_display.c | 1386 +++++++++++++--------------- + drivers/gpu/drm/i915/intel_dp.c | 194 +++- + drivers/gpu/drm/i915/intel_dp_mst.c | 10 +- + drivers/gpu/drm/i915/intel_drv.h | 104 ++- + drivers/gpu/drm/i915/intel_dsi.c | 2 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 381 ++++++++ + drivers/gpu/drm/i915/intel_frontbuffer.c | 279 ++++++ + drivers/gpu/drm/i915/intel_hdmi.c | 25 +- + drivers/gpu/drm/i915/intel_lrc.c | 2 +- + drivers/gpu/drm/i915/intel_lvds.c | 2 +- + drivers/gpu/drm/i915/intel_panel.c | 37 +- + drivers/gpu/drm/i915/intel_pm.c | 1312 +++----------------------- + drivers/gpu/drm/i915/intel_ringbuffer.c | 216 +++-- + drivers/gpu/drm/i915/intel_runtime_pm.c | 1375 +++++++++++++++++++++++++++ + drivers/gpu/drm/i915/intel_sprite.c | 476 +++++++--- + drivers/gpu/drm/i915/intel_tv.c | 9 +- + drivers/gpu/drm/i915/intel_uncore.c | 110 +-- + include/drm/drm_dp_helper.h | 5 +- + include/drm/i915_pciids.h | 17 + + 39 files changed, 4524 insertions(+), 3093 deletions(-) + create mode 100644 drivers/gpu/drm/i915/intel_fifo_underrun.c + create mode 100644 drivers/gpu/drm/i915/intel_frontbuffer.c + create mode 100644 drivers/gpu/drm/i915/intel_runtime_pm.c +Merging drm-panel/drm/panel/for-next (7d1311b93e58 Linux 3.17-rc1) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (b5bdca7dade9 drm/i915/audio: add DOC comment describing HDA over HDMI/DP) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 5 + + drivers/gpu/drm/drm_plane_helper.c | 5 + + drivers/gpu/drm/i915/Makefile | 6 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 18 +- + drivers/gpu/drm/i915/i915_debugfs.c | 132 +++- + drivers/gpu/drm/i915/i915_drv.c | 75 +- + drivers/gpu/drm/i915/i915_drv.h | 97 ++- + drivers/gpu/drm/i915/i915_gem.c | 55 +- + drivers/gpu/drm/i915/i915_gem_context.c | 10 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 35 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 26 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 8 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 2 + + drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 1 + + drivers/gpu/drm/i915/i915_gpu_error.c | 10 +- + drivers/gpu/drm/i915/i915_irq.c | 153 ++-- + drivers/gpu/drm/i915/i915_params.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 303 +++++--- + drivers/gpu/drm/i915/intel_audio.c | 462 +++++++++++ + drivers/gpu/drm/i915/intel_ddi.c | 61 +- + drivers/gpu/drm/i915/intel_display.c | 1033 ++++++++++++------------ + drivers/gpu/drm/i915/intel_dp.c | 429 ++++++---- + drivers/gpu/drm/i915/intel_drv.h | 70 +- + drivers/gpu/drm/i915/intel_fbdev.c | 20 +- + drivers/gpu/drm/i915/intel_hdmi.c | 19 +- + drivers/gpu/drm/i915/intel_lrc.c | 52 +- + drivers/gpu/drm/i915/intel_pm.c | 1034 ++++++++++++++++++++++++- + drivers/gpu/drm/i915/intel_renderstate.h | 1 + + drivers/gpu/drm/i915/intel_renderstate_gen8.c | 802 +++++++++++++++---- + drivers/gpu/drm/i915/intel_renderstate_gen9.c | 974 +++++++++++++++++++++++ + drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 20 +- + drivers/gpu/drm/i915/intel_sprite.c | 170 ++-- + drivers/gpu/drm/i915/intel_uncore.c | 175 ++++- + include/uapi/drm/i915_drm.h | 6 + + 36 files changed, 4933 insertions(+), 1347 deletions(-) + create mode 100644 drivers/gpu/drm/i915/intel_audio.c + create mode 100644 drivers/gpu/drm/i915/intel_renderstate_gen9.c +Merging drm-tegra/drm/tegra/for-next (8ed05f485498 drm/tegra: Depend on COMMON_CLK) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging drm-misc/topic/core-stuff (babc94936b7a drm/edid: add #defines and helpers for ELD) +$ git merge drm-misc/topic/core-stuff +Auto-merging include/drm/drm_dp_mst_helper.h +Auto-merging include/drm/drm_dp_helper.h +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_cmd_parser.c +Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_crtc.c | 40 +++---- + drivers/gpu/drm/drm_dp_helper.c | 194 +------------------------------ + drivers/gpu/drm/drm_dp_mst_topology.c | 15 +-- + drivers/gpu/drm/drm_drv.c | 5 +- + drivers/gpu/drm/drm_fb_helper.c | 1 - + drivers/gpu/drm/drm_fops.c | 12 +- + drivers/gpu/drm/drm_irq.c | 4 +- + drivers/gpu/drm/drm_modes.c | 2 +- + drivers/gpu/drm/drm_prime.c | 4 +- + drivers/gpu/drm/drm_probe_helper.c | 3 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 195 ++++++++++++++++++++++++++++++++ + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 49 -------- + drivers/gpu/drm/i915/i915_cmd_parser.c | 4 +- + drivers/gpu/drm/i915/i915_reg.h | 2 +- + drivers/gpu/drm/i915/intel_lrc.c | 2 +- + drivers/gpu/drm/i915/intel_sdvo.c | 47 -------- + include/drm/drmP.h | 8 +- + include/drm/drm_dp_helper.h | 21 +--- + include/drm/drm_dp_mst_helper.h | 2 +- + include/drm/drm_edid.h | 102 +++++++++++++++++ + 20 files changed, 347 insertions(+), 365 deletions(-) +Merging sound/for-next (19566b0bd93c Merge branch 'for-linus' into for-next) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + Documentation/DocBook/alsa-driver-api.tmpl | 31 +++ + Documentation/DocBook/writing-an-alsa-driver.tmpl | 23 ++ + Documentation/sound/alsa/ControlNames.txt | 32 ++- + Documentation/sound/alsa/Procfile.txt | 17 +- + include/sound/compress_driver.h | 5 +- + include/sound/jack.h | 19 +- + include/sound/pcm.h | 253 ++++++++++++++++--- + include/sound/seq_kernel.h | 4 + + include/uapi/sound/compress_offload.h | 17 +- + sound/aoa/codecs/onyx.c | 8 +- + sound/aoa/codecs/tas.c | 10 +- + sound/core/Makefile | 3 + + sound/core/control.c | 69 +++-- + sound/core/init.c | 33 ++- + sound/core/pcm.c | 48 +++- + sound/core/pcm_lib.c | 148 ++--------- + sound/core/pcm_native.c | 184 +++++++------- + sound/core/pcm_trace.h | 110 ++++++++ + sound/core/seq/seq.c | 5 +- + sound/core/seq/seq_device.c | 103 +++++--- + sound/core/sound.c | 9 +- + sound/drivers/mts64.c | 18 +- + sound/drivers/vx/vx_mixer.c | 35 +-- + sound/firewire/bebob/bebob.h | 4 +- + sound/firewire/bebob/bebob_focusrite.c | 10 +- + sound/firewire/bebob/bebob_maudio.c | 59 ++--- + sound/firewire/bebob/bebob_terratec.c | 4 +- + sound/firewire/bebob/bebob_yamaha.c | 2 +- + sound/i2c/other/ak4xxx-adda.c | 26 +- + sound/isa/ad1816a/ad1816a_lib.c | 10 +- + sound/isa/es1688/es1688_lib.c | 10 +- + sound/isa/es18xx.c | 78 +++--- + sound/isa/msnd/msnd_pinnacle_mixer.c | 11 +- + sound/isa/sb/sb16_main.c | 10 +- + sound/isa/sb/sb_mixer.c | 31 +-- + sound/isa/wss/wss_lib.c | 16 +- + sound/mips/sgio2audio.c | 11 +- + sound/parisc/harmony.c | 12 +- + sound/pci/ac97/ac97_codec.c | 10 +- + sound/pci/ac97/ac97_patch.c | 198 +++++---------- + sound/pci/ac97/ac97_patch.h | 2 +- + sound/pci/asihpi/asihpi.c | 46 +--- + sound/pci/au88x0/au88x0.c | 35 ++- + sound/pci/au88x0/au88x0.h | 4 +- + sound/pci/au88x0/au88x0_a3d.c | 21 +- + sound/pci/au88x0/au88x0_core.c | 102 ++++---- + sound/pci/au88x0/au88x0_eq.c | 3 +- + sound/pci/au88x0/au88x0_game.c | 3 +- + sound/pci/au88x0/au88x0_mpu401.c | 2 +- + sound/pci/au88x0/au88x0_pcm.c | 8 +- + sound/pci/au88x0/au88x0_synth.c | 17 +- + sound/pci/aw2/aw2-alsa.c | 13 +- + sound/pci/azt3328.c | 13 +- + sound/pci/ca0106/ca0106_mixer.c | 40 +-- + sound/pci/ctxfi/ctatc.c | 10 +- + sound/pci/ctxfi/cttimer.c | 4 +- + sound/pci/echoaudio/darla20_dsp.c | 5 +- + sound/pci/echoaudio/darla24_dsp.c | 13 +- + sound/pci/echoaudio/echo3g_dsp.c | 5 +- + sound/pci/echoaudio/echoaudio.c | 142 ++++------- + sound/pci/echoaudio/echoaudio.h | 31 +-- + sound/pci/echoaudio/echoaudio_3g.c | 27 +- + sound/pci/echoaudio/echoaudio_dsp.c | 109 ++++---- + sound/pci/echoaudio/echoaudio_gml.c | 11 +- + sound/pci/echoaudio/gina20_dsp.c | 9 +- + sound/pci/echoaudio/gina24_dsp.c | 30 +-- + sound/pci/echoaudio/indigo_dsp.c | 11 +- + sound/pci/echoaudio/indigo_express_dsp.c | 6 +- + sound/pci/echoaudio/indigodj_dsp.c | 11 +- + sound/pci/echoaudio/indigodjx_dsp.c | 5 +- + sound/pci/echoaudio/indigoio_dsp.c | 8 +- + sound/pci/echoaudio/indigoiox_dsp.c | 5 +- + sound/pci/echoaudio/layla20_dsp.c | 28 +-- + sound/pci/echoaudio/layla24_dsp.c | 26 +- + sound/pci/echoaudio/mia_dsp.c | 15 +- + sound/pci/echoaudio/midi.c | 23 +- + sound/pci/echoaudio/mona_dsp.c | 29 ++- + sound/pci/emu10k1/emu10k1_main.c | 9 +- + sound/pci/emu10k1/emufx.c | 3 +- + sound/pci/emu10k1/emumixer.c | 58 +---- + sound/pci/emu10k1/p16v.c | 20 +- + sound/pci/es1938.c | 10 +- + sound/pci/es1968.c | 15 +- + sound/pci/fm801.c | 10 +- + sound/pci/hda/hda_auto_parser.c | 66 ++++- + sound/pci/hda/hda_beep.c | 38 +++ + sound/pci/hda/hda_codec.c | 291 +++++++++++++++++++--- + sound/pci/hda/hda_eld.c | 2 +- + sound/pci/hda/hda_generic.c | 181 +++++++++++--- + sound/pci/hda/hda_jack.c | 60 +++++ + sound/pci/hda/hda_jack.h | 5 + + sound/pci/hda/hda_sysfs.c | 35 ++- + sound/pci/ice1712/aureon.c | 46 +--- + sound/pci/ice1712/ews.c | 16 +- + sound/pci/ice1712/ice1712.c | 27 +- + sound/pci/ice1712/ice1724.c | 8 +- + sound/pci/ice1712/maya44.c | 20 +- + sound/pci/ice1712/phase.c | 12 +- + sound/pci/ice1712/pontis.c | 8 +- + sound/pci/ice1712/prodigy192.c | 18 +- + sound/pci/ice1712/prodigy_hifi.c | 11 +- + sound/pci/ice1712/quartet.c | 27 +- + sound/pci/ice1712/se.c | 9 +- + sound/pci/korg1212/korg1212.c | 26 +- + sound/pci/pcxhr/pcxhr.c | 52 ++-- + sound/pci/pcxhr/pcxhr_core.c | 10 +- + sound/pci/pcxhr/pcxhr_mixer.c | 18 +- + sound/pci/rme32.c | 34 +-- + sound/pci/rme96.c | 62 ++--- + sound/pci/rme9652/hdsp.c | 175 +++++-------- + sound/pci/rme9652/hdspm.c | 36 +-- + sound/pci/rme9652/rme9652.c | 58 ++--- + sound/pci/sonicvibes.c | 10 +- + sound/pci/via82xx.c | 10 +- + sound/ppc/tumbler.c | 11 +- + sound/sparc/cs4231.c | 12 +- + sound/usb/6fire/control.c | 22 +- + sound/usb/card.c | 109 ++++---- + sound/usb/endpoint.c | 7 +- + sound/usb/endpoint.h | 2 +- + sound/usb/mixer.c | 14 +- + sound/usb/mixer.h | 2 +- + sound/usb/mixer_quirks.c | 35 +-- + 123 files changed, 2198 insertions(+), 2070 deletions(-) + create mode 100644 sound/core/pcm_trace.h +Merging sound-asoc/for-next (3333c009c30c Merge remote-tracking branches 'asoc/topic/wm9712' and 'asoc/topic/wm9713' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/codecs/ad1980.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/eukrea-tlv320.txt | 15 +- + .../devicetree/bindings/sound/fsl,esai.txt | 44 +- + .../devicetree/bindings/sound/fsl,spdif.txt | 37 +- + .../devicetree/bindings/sound/fsl-sai.txt | 66 +- + .../bindings/sound/imx-audio-sgtl5000.txt | 61 +- + .../devicetree/bindings/sound/imx-audio-spdif.txt | 22 +- + .../devicetree/bindings/sound/imx-audio-wm8962.txt | 45 +- + .../devicetree/bindings/sound/imx-audmux.txt | 22 +- + .../devicetree/bindings/sound/max98090.txt | 2 + + Documentation/devicetree/bindings/sound/rt5677.txt | 17 + + .../devicetree/bindings/sound/sgtl5000.txt | 13 + + arch/arm/mach-pxa/spitz.c | 9 + + arch/x86/include/asm/platform_sst_audio.h | 62 + + include/sound/rt5677.h | 10 + + include/sound/soc-dai.h | 3 - + include/sound/soc-dapm.h | 9 +- + include/sound/soc-dpcm.h | 2 + + include/sound/soc.h | 23 +- + sound/soc/Makefile | 2 +- + sound/soc/atmel/atmel_ssc_dai.c | 5 +- + sound/soc/blackfin/bf5xx-ad1980.c | 2 - + sound/soc/cirrus/Kconfig | 3 +- + sound/soc/codecs/Kconfig | 33 +- + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/ad1980.c | 23 +- + sound/soc/codecs/ad1980.h | 26 - + sound/soc/codecs/ak4535.c | 31 +- + sound/soc/codecs/ak4641.c | 33 +- + sound/soc/codecs/ak4642.c | 16 - + sound/soc/codecs/ak4671.c | 13 - + sound/soc/codecs/cs4265.c | 2 - + sound/soc/codecs/cs4271-i2c.c | 62 + + sound/soc/codecs/cs4271-spi.c | 55 + + sound/soc/codecs/cs4271.c | 155 +-- + sound/soc/codecs/cs4271.h | 11 + + sound/soc/codecs/es8328-i2c.c | 2 +- + sound/soc/codecs/hdmi.c | 2 + + sound/soc/codecs/max98088.c | 27 +- + sound/soc/codecs/max98090.c | 195 +++- + sound/soc/codecs/max98090.h | 8 + + sound/soc/codecs/max98095.c | 5 - + sound/soc/codecs/max9850.c | 22 +- + sound/soc/codecs/rt286.c | 211 +++- + sound/soc/codecs/rt5645.c | 42 +- + sound/soc/codecs/rt5645.h | 1 + + sound/soc/codecs/rt5677-spi.c | 130 +++ + sound/soc/codecs/rt5677-spi.h | 21 + + sound/soc/codecs/rt5677.c | 708 +++++++++++- + sound/soc/codecs/rt5677.h | 94 +- + sound/soc/codecs/sgtl5000.c | 98 +- + sound/soc/codecs/sn95031.c | 6 +- + sound/soc/codecs/sta32x.c | 21 +- + sound/soc/codecs/sta350.c | 21 +- + sound/soc/codecs/sta529.c | 35 +- + sound/soc/codecs/stac9766.c | 20 +- + sound/soc/codecs/tas2552.c | 10 +- + sound/soc/codecs/wl1273.c | 10 +- + sound/soc/codecs/wm8731.c | 3 +- + sound/soc/codecs/wm8737.c | 22 +- + sound/soc/codecs/wm8961.c | 14 +- + sound/soc/codecs/wm8962.c | 3 +- + sound/soc/codecs/wm8995.c | 14 +- + sound/soc/codecs/wm9705.c | 14 +- + sound/soc/codecs/wm9712.c | 17 +- + sound/soc/codecs/wm9713.c | 51 +- + sound/soc/davinci/davinci-mcasp.c | 95 +- + sound/soc/davinci/davinci-mcasp.h | 6 + + sound/soc/fsl/eukrea-tlv320.c | 5 +- + sound/soc/fsl/fsl-asoc-card.c | 7 +- + sound/soc/fsl/fsl_asrc.c | 26 + + sound/soc/fsl/imx-sgtl5000.c | 6 +- + sound/soc/fsl/imx-spdif.c | 3 +- + sound/soc/fsl/imx-wm8962.c | 6 +- + sound/soc/generic/simple-card.c | 158 ++- + sound/soc/intel/Kconfig | 11 +- + sound/soc/intel/Makefile | 3 + + sound/soc/intel/broadwell.c | 49 +- + sound/soc/intel/sst-atom-controls.c | 1208 +++++++++++++++++++- + sound/soc/intel/sst-atom-controls.h | 428 +++++++ + sound/soc/intel/sst-baytrail-dsp.c | 24 +- + sound/soc/intel/sst-dsp-priv.h | 136 ++- + sound/soc/intel/sst-dsp.c | 31 + + sound/soc/intel/sst-dsp.h | 28 +- + sound/soc/intel/sst-firmware.c | 937 ++++++++++++--- + sound/soc/intel/sst-haswell-dsp.c | 295 +++-- + sound/soc/intel/sst-haswell-ipc.c | 378 ++++-- + sound/soc/intel/sst-haswell-ipc.h | 24 +- + sound/soc/intel/sst-haswell-pcm.c | 356 +++++- + sound/soc/intel/sst-mfld-platform-compress.c | 8 +- + sound/soc/intel/sst-mfld-platform-pcm.c | 154 ++- + sound/soc/intel/sst-mfld-platform.h | 5 + + sound/soc/intel/sst/Makefile | 3 + + sound/soc/intel/sst/sst.c | 572 +++++++++ + sound/soc/intel/sst/sst.h | 540 +++++++++ + sound/soc/intel/sst/sst_drv_interface.c | 686 +++++++++++ + sound/soc/intel/sst/sst_ipc.c | 373 ++++++ + sound/soc/intel/sst/sst_loader.c | 456 ++++++++ + sound/soc/intel/sst/sst_pvt.c | 446 ++++++++ + sound/soc/intel/sst/sst_stream.c | 437 +++++++ + sound/soc/pxa/mioa701_wm9713.c | 7 +- + sound/soc/pxa/spitz.c | 52 +- + sound/soc/rockchip/Kconfig | 7 +- + sound/soc/rockchip/rockchip_i2s.c | 4 +- + sound/soc/sh/fsi.c | 3 +- + sound/soc/sh/rcar/core.c | 3 +- + sound/soc/sh/rcar/dvc.c | 61 +- + sound/soc/sh/rcar/gen.c | 27 +- + sound/soc/soc-compress.c | 11 +- + sound/soc/soc-core.c | 1081 +----------------- + sound/soc/soc-dapm.c | 755 ++++++------ + sound/soc/soc-jack.c | 9 +- + sound/soc/soc-ops.c | 952 +++++++++++++++ + sound/soc/soc-pcm.c | 75 +- + sound/soc/tegra/tegra_rt5640.c | 6 +- + sound/soc/txx9/txx9aclc.c | 2 +- + 115 files changed, 10783 insertions(+), 2939 deletions(-) + delete mode 100644 sound/soc/codecs/ad1980.h + create mode 100644 sound/soc/codecs/cs4271-i2c.c + create mode 100644 sound/soc/codecs/cs4271-spi.c + create mode 100644 sound/soc/codecs/cs4271.h + create mode 100644 sound/soc/codecs/rt5677-spi.c + create mode 100644 sound/soc/codecs/rt5677-spi.h + create mode 100644 sound/soc/intel/sst/Makefile + create mode 100644 sound/soc/intel/sst/sst.c + create mode 100644 sound/soc/intel/sst/sst.h + create mode 100644 sound/soc/intel/sst/sst_drv_interface.c + create mode 100644 sound/soc/intel/sst/sst_ipc.c + create mode 100644 sound/soc/intel/sst/sst_loader.c + create mode 100644 sound/soc/intel/sst/sst_pvt.c + create mode 100644 sound/soc/intel/sst/sst_stream.c + create mode 100644 sound/soc/soc-ops.c +Merging modules/modules-next (d3051b489aa8 modules, lock around setting of MODULE_STATE_UNFORMED) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (1bbc26062754 virtio-rng: refactor probe error handling) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (02b6a58b83b2 Input: touchscreen - use __maybe_unused instead of ifdef around suspend/resume) +$ git merge input/next +Auto-merging drivers/input/touchscreen/edt-ft5x06.c +Auto-merging drivers/input/touchscreen/ad7879.c +Auto-merging drivers/input/serio/altera_ps2.c +Auto-merging drivers/input/misc/max77693-haptic.c +Removing drivers/input/keyboard/cap1106.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/input/cap11xx.txt +Merge made by the 'recursive' strategy. + .../bindings/input/{cap1106.txt => cap11xx.txt} | 26 +- + .../devicetree/bindings/input/elan_i2c.txt | 34 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 6 + + drivers/input/keyboard/Kconfig | 8 +- + drivers/input/keyboard/Makefile | 2 +- + drivers/input/keyboard/cap1106.c | 341 ------ + drivers/input/keyboard/cap11xx.c | 376 +++++++ + drivers/input/keyboard/lpc32xx-keys.c | 92 +- + drivers/input/keyboard/mpr121_touchkey.c | 42 +- + drivers/input/keyboard/pxa27x_keypad.c | 84 +- + drivers/input/misc/88pm860x_onkey.c | 6 +- + drivers/input/misc/ad714x-i2c.c | 6 +- + drivers/input/misc/ad714x-spi.c | 6 +- + drivers/input/misc/adxl34x-i2c.c | 6 +- + drivers/input/misc/adxl34x-spi.c | 6 +- + drivers/input/misc/drv260x.c | 6 +- + drivers/input/misc/drv2667.c | 6 +- + drivers/input/misc/gp2ap002a00f.c | 6 +- + drivers/input/misc/kxtj9.c | 6 +- + drivers/input/misc/max77693-haptic.c | 6 +- + drivers/input/misc/max8925_onkey.c | 6 +- + drivers/input/misc/max8997_haptic.c | 4 +- + drivers/input/misc/palmas-pwrbutton.c | 6 +- + drivers/input/misc/pm8xxx-vibrator.c | 4 +- + drivers/input/misc/pmic8xxx-pwrkey.c | 6 +- + drivers/input/misc/pwm-beeper.c | 6 +- + drivers/input/misc/sirfsoc-onkey.c | 4 +- + drivers/input/misc/twl4030-vibra.c | 6 +- + drivers/input/misc/twl6040-vibra.c | 4 +- + drivers/input/mouse/Kconfig | 30 + + drivers/input/mouse/Makefile | 5 + + drivers/input/mouse/cyapa.c | 6 +- + drivers/input/mouse/elan_i2c.h | 86 ++ + drivers/input/mouse/elan_i2c_core.c | 1137 ++++++++++++++++++++ + drivers/input/mouse/elan_i2c_i2c.c | 611 +++++++++++ + drivers/input/mouse/elan_i2c_smbus.c | 514 +++++++++ + drivers/input/mouse/navpoint.c | 6 +- + drivers/input/mouse/synaptics_i2c.c | 6 +- + drivers/input/serio/altera_ps2.c | 81 +- + drivers/input/touchscreen/Kconfig | 13 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/ad7877.c | 6 +- + drivers/input/touchscreen/ad7879.c | 6 +- + drivers/input/touchscreen/ads7846.c | 6 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 6 +- + drivers/input/touchscreen/auo-pixcir-ts.c | 6 +- + drivers/input/touchscreen/cy8ctmg110_ts.c | 6 +- + drivers/input/touchscreen/cyttsp_core.c | 7 +- + drivers/input/touchscreen/edt-ft5x06.c | 6 +- + drivers/input/touchscreen/eeti_ts.c | 6 +- + drivers/input/touchscreen/egalax_ts.c | 6 +- + drivers/input/touchscreen/goodix.c | 395 +++++++ + drivers/input/touchscreen/ili210x.c | 6 +- + drivers/input/touchscreen/ipaq-micro-ts.c | 6 +- + drivers/input/touchscreen/mms114.c | 6 +- + drivers/input/touchscreen/pixcir_i2c_ts.c | 6 +- + drivers/input/touchscreen/st1232.c | 7 +- + drivers/input/touchscreen/tsc2005.c | 6 +- + drivers/input/touchscreen/ucb1400_ts.c | 6 +- + drivers/input/touchscreen/wacom_i2c.c | 6 +- + drivers/input/touchscreen/zforce_ts.c | 6 +- + 62 files changed, 3385 insertions(+), 740 deletions(-) + rename Documentation/devicetree/bindings/input/{cap1106.txt => cap11xx.txt} (64%) + create mode 100644 Documentation/devicetree/bindings/input/elan_i2c.txt + delete mode 100644 drivers/input/keyboard/cap1106.c + create mode 100644 drivers/input/keyboard/cap11xx.c + create mode 100644 drivers/input/mouse/elan_i2c.h + create mode 100644 drivers/input/mouse/elan_i2c_core.c + create mode 100644 drivers/input/mouse/elan_i2c_i2c.c + create mode 100644 drivers/input/mouse/elan_i2c_smbus.c + create mode 100644 drivers/input/touchscreen/goodix.c +Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) +$ git merge input-mt/for-next +Already up-to-date. +Merging block/for-next (0f6ea1801d84 Merge branch 'for-3.19/drivers' into for-next) +$ git merge block/for-next +Auto-merging include/linux/blkdev.h +Auto-merging drivers/scsi/scsi_lib.c +Merge made by the 'recursive' strategy. + Documentation/block/biodoc.txt | 6 +- + block/blk-mq.c | 36 +- + block/blk-settings.c | 4 +- + block/ioprio.c | 14 +- + drivers/block/aoe/aoeblk.c | 2 +- + drivers/block/mtip32xx/mtip32xx.c | 5 +- + drivers/block/null_blk.c | 10 +- + drivers/block/nvme-core.c | 1549 +++++++++++++++++-------------------- + drivers/block/nvme-scsi.c | 162 +--- + drivers/block/virtio_blk.c | 7 +- + drivers/scsi/scsi_lib.c | 5 +- + fs/fs-writeback.c | 29 +- + include/linux/blk-mq.h | 18 +- + include/linux/blkdev.h | 1 - + include/linux/nvme.h | 18 +- + include/uapi/linux/nvme.h | 46 +- + 16 files changed, 887 insertions(+), 1025 deletions(-) +Merging device-mapper/for-next (f8cc4537dae7 dm: do not call dm_sync_table() when creating new devices) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm-bufio.c +Merge made by the 'recursive' strategy. + Documentation/device-mapper/cache-policies.txt | 24 +- + drivers/md/dm-bio-prison.c | 186 +++--- + drivers/md/dm-bio-prison.h | 16 +- + drivers/md/dm-bufio.c | 218 ++++--- + drivers/md/dm-cache-policy-mq.c | 82 ++- + drivers/md/dm-cache-target.c | 3 +- + drivers/md/dm-ioctl.c | 5 +- + drivers/md/dm-raid.c | 17 +- + drivers/md/dm-stripe.c | 4 +- + drivers/md/dm-table.c | 36 +- + drivers/md/dm-thin-metadata.c | 35 +- + drivers/md/dm-thin-metadata.h | 9 +- + drivers/md/dm-thin.c | 702 +++++++++++++++++---- + drivers/md/dm.c | 244 +++++-- + drivers/md/dm.h | 9 + + .../md/persistent-data/dm-transaction-manager.c | 77 ++- + .../md/persistent-data/dm-transaction-manager.h | 7 + + include/linux/device-mapper.h | 2 + + include/uapi/linux/dm-ioctl.h | 9 +- + 19 files changed, 1219 insertions(+), 466 deletions(-) +Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage) +$ git merge pcmcia/master +Already up-to-date. +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 (71884933b574 mmc:sdhci-pci: enable sdhci doesn't support hs200 quirk for AMD sdhci) +$ git merge mmc-uh/next +Auto-merging include/linux/platform_data/mmc-atmel-mci.h +Removing arch/avr32/mach-at32ap/include/mach/atmel-mci.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/sdhci-pxa.txt | 7 + + arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- + arch/avr32/mach-at32ap/at32ap700x.c | 2 +- + arch/avr32/mach-at32ap/include/mach/atmel-mci.h | 17 -- + drivers/mmc/card/block.c | 70 +++--- + drivers/mmc/card/mmc_test.c | 28 ++- + drivers/mmc/core/bus.c | 55 +---- + drivers/mmc/core/core.c | 51 +++-- + drivers/mmc/core/debugfs.c | 9 +- + drivers/mmc/core/host.c | 21 +- + drivers/mmc/core/mmc.c | 184 +++++++--------- + drivers/mmc/core/mmc_ops.c | 61 ++--- + drivers/mmc/core/mmc_ops.h | 2 +- + drivers/mmc/core/sdio_bus.c | 16 +- + drivers/mmc/host/atmel-mci.c | 103 ++++++--- + drivers/mmc/host/dw_mmc-rockchip.c | 3 + + drivers/mmc/host/dw_mmc.c | 128 +++-------- + drivers/mmc/host/dw_mmc.h | 2 - + drivers/mmc/host/mmci.c | 7 + + drivers/mmc/host/msm_sdcc.c | 6 +- + drivers/mmc/host/mxcmmc.c | 25 +-- + drivers/mmc/host/sdhci-acpi.c | 40 ++-- + drivers/mmc/host/sdhci-esdhc-imx.c | 10 +- + drivers/mmc/host/sdhci-of-arasan.c | 5 +- + drivers/mmc/host/sdhci-pci-o2micro.c | 2 - + drivers/mmc/host/sdhci-pci.c | 43 +++- + drivers/mmc/host/sdhci-pxav2.c | 15 +- + drivers/mmc/host/sdhci-pxav3.c | 60 +++-- + drivers/mmc/host/sdhci-s3c.c | 8 +- + drivers/mmc/host/sdhci.c | 245 +++++++++++++-------- + drivers/mmc/host/sdhci.h | 41 ++++ + drivers/mmc/host/sunxi-mmc.c | 1 - + include/linux/atmel-mci.h | 2 + + include/linux/mmc/card.h | 23 +- + include/linux/mmc/core.h | 2 +- + include/linux/mmc/dw_mmc.h | 2 - + include/linux/mmc/mmc.h | 3 + + include/linux/mmc/sdhci.h | 16 +- + include/linux/mmc/sdio_func.h | 2 - + .../linux/platform_data/mmc-atmel-mci.h | 13 +- + include/linux/platform_data/pxa_sdhci.h | 5 - + 41 files changed, 698 insertions(+), 639 deletions(-) + delete mode 100644 arch/avr32/mach-at32ap/include/mach/atmel-mci.h + rename arch/arm/mach-at91/include/mach/atmel-mci.h => include/linux/platform_data/mmc-atmel-mci.h (52%) +Merging kgdb/kgdb-next (662bfa325be1 kernel/debug/debug_core.c: Logging clean-up) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/debug_core.c | 43 +++++++++++++++++++++---------------------- + 1 file changed, 21 insertions(+), 22 deletions(-) +Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (b395f75eabb3 lib/raid6: Add log level to printks) +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-mfd-next (4a288f1edf33 mfd: tc6393xb: Fail ohci suspend if full state restore is required) +$ git merge mfd/for-mfd-next +Auto-merging include/linux/of.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/atmel-hlcdc.txt | 51 +++++++++ + Documentation/devicetree/bindings/mfd/max77686.txt | 6 + + Documentation/devicetree/bindings/mfd/max77693.txt | 21 ++++ + drivers/hid/hid-sensor-hub.c | 8 +- + drivers/mfd/Kconfig | 7 +- + drivers/mfd/Makefile | 3 +- + drivers/mfd/ab8500-sysctrl.c | 57 ---------- + drivers/mfd/arizona-spi.c | 2 + + drivers/mfd/atmel-hlcdc.c | 122 +++++++++++++++++++++ + drivers/mfd/db8500-prcmu.c | 22 ++-- + drivers/mfd/lpc_sch.c | 6 +- + drivers/mfd/max77693.c | 31 +++++- + drivers/mfd/mfd-core.c | 8 +- + drivers/mfd/rts5227.c | 6 + + drivers/mfd/rts5249.c | 4 + + drivers/mfd/rtsx_gops.c | 37 +++++++ + drivers/mfd/rtsx_pcr.h | 3 + + drivers/mfd/rtsx_usb.c | 4 +- + drivers/mfd/sec-core.c | 10 -- + drivers/mfd/syscon.c | 96 ++++++++++++---- + drivers/mfd/tc6393xb.c | 13 ++- + drivers/mfd/tps65217.c | 2 + + drivers/mfd/tps65910.c | 3 +- + drivers/mfd/twl4030-power.c | 3 + + drivers/mfd/viperboard.c | 4 +- + drivers/mfd/wm8350-core.c | 2 +- + include/linux/mfd/abx500/ab8500-sysctrl.h | 1 - + include/linux/mfd/atmel-hlcdc.h | 85 ++++++++++++++ + include/linux/mfd/core.h | 7 ++ + include/linux/mfd/max77693-private.h | 1 - + include/linux/mfd/rtsx_pci.h | 28 +++++ + include/linux/of.h | 11 ++ + 32 files changed, 537 insertions(+), 127 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt + create mode 100644 drivers/mfd/atmel-hlcdc.c + create mode 100644 drivers/mfd/rtsx_gops.c + create mode 100644 include/linux/mfd/atmel-hlcdc.h +Merging backlight/for-backlight-next (0df1f2487d2f Linux 3.18-rc3) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (cdaf3e15385d power: charger-manager: Fix accessing invalidated power supply after charger unbind) +$ git merge battery/master +Merge made by the 'recursive' strategy. + drivers/power/ab8500_fg.c | 17 ++-- + drivers/power/bq2415x_charger.c | 23 +++-- + drivers/power/charger-manager.c | 164 +++++++++++++++++++++++----------- + drivers/power/power_supply_core.c | 3 + + include/linux/power/charger-manager.h | 3 - + include/linux/power_supply.h | 6 ++ + 6 files changed, 144 insertions(+), 72 deletions(-) +Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) +$ git merge fbdev/for-next +Already up-to-date. +Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (f114040e3ea6 Linux 3.18-rc1) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (5386984c6ba1 Merge remote-tracking branches 'regulator/topic/s2mpa01', 'regulator/topic/s2mps11', 'regulator/topic/sky81452', 'regulator/topic/stub' and 'regulator/topic/suspend' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/poweroff.txt | 18 +++ + .../bindings/regulator/act8865-regulator.txt | 4 + + .../devicetree/bindings/regulator/regulator.txt | 15 ++ + drivers/regulator/act8865-regulator.c | 31 ++++ + drivers/regulator/anatop-regulator.c | 13 ++ + drivers/regulator/core.c | 5 +- + drivers/regulator/dummy.c | 2 +- + drivers/regulator/max1586.c | 2 +- + drivers/regulator/max77686.c | 83 ++++++++--- + drivers/regulator/max77693.c | 4 +- + drivers/regulator/max77802.c | 158 +++++++++++++++------ + drivers/regulator/max8660.c | 2 +- + drivers/regulator/of_regulator.c | 47 +++++- + drivers/regulator/rk808-regulator.c | 57 +++++++- + drivers/regulator/rn5t618-regulator.c | 51 +------ + drivers/regulator/s2mpa01.c | 4 +- + drivers/regulator/s2mps11.c | 2 +- + drivers/regulator/sky81452-regulator.c | 1 - + include/dt-bindings/regulator/maxim,max77802.h | 18 +++ + include/linux/mfd/max77686.h | 7 - + include/linux/regulator/consumer.h | 2 +- + include/linux/regulator/driver.h | 4 + + 22 files changed, 395 insertions(+), 135 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/poweroff.txt + create mode 100644 include/dt-bindings/regulator/maxim,max77802.h +Merging security/next (594081ee7145 integrity: do zero padding of the key id) +$ git merge security/next +Already up-to-date. +Merging integrity/next (c2426d2ad502 ima: added support for new kernel cmdline parameter ima_template_fmt) +$ git merge integrity/next +Auto-merging security/integrity/integrity.h +Auto-merging security/integrity/ima/ima_api.c +Auto-merging security/integrity/evm/evm_main.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 4 ++ + Documentation/security/IMA-templates.txt | 29 +++++---- + security/integrity/digsig.c | 2 +- + security/integrity/evm/evm_main.c | 11 +++- + security/integrity/iint.c | 3 - + security/integrity/ima/ima_api.c | 4 +- + security/integrity/ima/ima_fs.c | 37 ++++++++--- + security/integrity/ima/ima_main.c | 5 +- + security/integrity/ima/ima_policy.c | 36 +++-------- + security/integrity/ima/ima_template.c | 103 +++++++++++++++++++++---------- + security/integrity/integrity.h | 5 +- + 11 files changed, 140 insertions(+), 99 deletions(-) +Merging selinux/next (4093a8443941 selinux: normalize audit log formatting) +$ git merge selinux/next +Already up-to-date. +Merging lblnet/next (d8ec26d7f828 Linux 3.13) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (8ae1a57f54af watchdog: s3c2410_wdt: Fix the mask bit offset for Exynos7) +$ git merge watchdog/master +Resolved 'drivers/watchdog/s3c2410_wdt.c' using previous resolution. +Auto-merging drivers/watchdog/s3c2410_wdt.c +CONFLICT (content): Merge conflict in drivers/watchdog/s3c2410_wdt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 229cd59133aa] Merge remote-tracking branch 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. + drivers/watchdog/s3c2410_wdt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging iommu/next (5988c921b747 Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip' and 'arm/renesas' into next) +$ git merge iommu/next +Removing drivers/iommu/omap-iommu2.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iommu/rockchip,iommu.txt | 26 + + drivers/iommu/Kconfig | 25 +- + drivers/iommu/Makefile | 2 +- + drivers/iommu/ipmmu-vmsa.c | 2 +- + drivers/iommu/msm_iommu.c | 3 +- + drivers/iommu/msm_iommu_dev.c | 10 +- + drivers/iommu/omap-iommu-debug.c | 242 ++--- + drivers/iommu/omap-iommu.c | 312 +++--- + drivers/iommu/omap-iommu.h | 98 +- + drivers/iommu/omap-iommu2.c | 337 ------- + drivers/iommu/rockchip-iommu.c | 1038 ++++++++++++++++++++ + 11 files changed, 1399 insertions(+), 696 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iommu/rockchip,iommu.txt + delete mode 100644 drivers/iommu/omap-iommu2.c + create mode 100644 drivers/iommu/rockchip-iommu.c +Merging dwmw2-iommu/master (1860e379875d Linux 3.15) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (93899a679fd6 vfio-pci: Fix remove path locking) +$ 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 (4041f42fa17b Merge branch 'docs-3.19' into docs-next) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/CodingStyle | 43 +++++++++++++++++++++++++++++++++++++++++++ + Documentation/mailbox.txt | 2 +- + drivers/dma-buf/fence.c | 2 +- + include/linux/fence.h | 4 ++-- + include/linux/i2c.h | 2 +- + 5 files changed, 48 insertions(+), 5 deletions(-) +Merging trivial/for-next (be278e980d95 clocksource: Fix 'clcoksource' typo in comment) +$ git merge trivial/for-next +Auto-merging include/scsi/scsi_host.h +Auto-merging drivers/usb/serial/usb-serial-simple.c +Auto-merging drivers/usb/gadget/legacy/zero.c +Auto-merging drivers/pinctrl/spear/pinctrl-plgpio.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/net/ethernet/atheros/atl1c/atl1c_main.c +Auto-merging drivers/clk/Kconfig +Auto-merging arch/powerpc/platforms/44x/Kconfig +Auto-merging arch/arm/mach-exynos/Kconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/clock/st/st,flexgen.txt | 2 +- + Documentation/scsi/scsi_eh.txt | 4 ++-- + Documentation/usb/gadget_configfs.txt | 2 +- + arch/arm/mach-exynos/Kconfig | 2 +- + arch/powerpc/lib/copyuser_power7.S | 2 +- + arch/powerpc/lib/memcpy_power7.S | 2 +- + arch/powerpc/mm/mmu_decl.h | 2 +- + arch/powerpc/platforms/44x/Kconfig | 1 - + drivers/clk/Kconfig | 2 +- + drivers/gpio/gpio-msm-v1.c | 2 +- + drivers/gpio/gpio-spear-spics.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- + drivers/pci/pci-driver.c | 4 ++-- + drivers/pinctrl/spear/pinctrl-plgpio.c | 2 +- + drivers/scsi/aha152x.c | 2 +- + drivers/scsi/isci/task.c | 2 +- + drivers/scsi/mac_scsi.c | 2 +- + drivers/usb/gadget/legacy/zero.c | 2 +- + drivers/usb/serial/usb-serial-simple.c | 2 +- + drivers/video/fbdev/exynos/exynos_mipi_dsi.c | 2 +- + drivers/video/fbdev/exynos/exynos_mipi_dsi_common.c | 2 +- + include/linux/mod_devicetable.h | 2 +- + include/scsi/scsi_host.h | 2 +- + kernel/time/clocksource.c | 2 +- + 24 files changed, 25 insertions(+), 26 deletions(-) +Merging audit/next (915f389d9c52 audit: add Paul Moore to the MAINTAINERS entry) +$ git merge audit/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (43c0767e17ac of/platform: Move platform devices under /sys/devices/platform) +$ git merge devicetree/devicetree/next +Auto-merging include/linux/of.h +Auto-merging drivers/of/unittest.c +Auto-merging drivers/of/base.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/of_selftest.txt | 20 +--- + Documentation/devicetree/todo.txt | 1 - + drivers/mfd/vexpress-sysreg.c | 2 +- + drivers/of/Kconfig | 4 +- + drivers/of/Makefile | 4 +- + drivers/of/address.c | 2 +- + drivers/of/base.c | 83 +++++++++------- + drivers/of/dynamic.c | 13 --- + drivers/of/fdt.c | 44 ++++----- + drivers/of/pdt.c | 27 ++--- + drivers/of/platform.c | 4 +- + .../{testcase-data => unittest-data}/testcases.dts | 0 + .../tests-interrupts.dtsi | 0 + .../tests-match.dtsi | 0 + .../tests-phandle.dtsi | 0 + .../tests-platform.dtsi | 0 + drivers/of/{selftest.c => unittest.c} | 110 ++++++++++++--------- + include/linux/of.h | 20 ++-- + include/linux/of_address.h | 4 +- + include/linux/of_pdt.h | 3 +- + 20 files changed, 166 insertions(+), 175 deletions(-) + rename drivers/of/{testcase-data => unittest-data}/testcases.dts (100%) + rename drivers/of/{testcase-data => unittest-data}/tests-interrupts.dtsi (100%) + rename drivers/of/{testcase-data => unittest-data}/tests-match.dtsi (100%) + rename drivers/of/{testcase-data => unittest-data}/tests-phandle.dtsi (100%) + rename drivers/of/{testcase-data => unittest-data}/tests-platform.dtsi (100%) + rename drivers/of/{selftest.c => unittest.c} (94%) +Merging dt-rh/for-next (d22e9131187d of: add vendor prefix for Chipidea) +$ git merge dt-rh/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (024b58aeba17 Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/dw', 'spi/topic/fsl-dspi' and 'spi/topic/gpio' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/spi-gpio.txt | 6 +- + drivers/spi/spi-atmel.c | 72 ++++++++++--- + drivers/spi/spi-dw-mid.c | 114 +++++++++++++++------ + drivers/spi/spi-dw.h | 2 +- + drivers/spi/spi-fsl-dspi.c | 7 +- + drivers/spi/spi-gpio.c | 21 ++-- + 6 files changed, 161 insertions(+), 61 deletions(-) +Merging tip/auto-latest (bb7c44a44b58 Merge branch 'x86/vdso') +$ git merge tip/auto-latest +Auto-merging net/core/dev.c +Auto-merging net/bluetooth/rfcomm/core.c +Auto-merging include/linux/acpi.h +Removing drivers/pci/ioapic.c +Auto-merging drivers/acpi/internal.h +Auto-merging drivers/acpi/Makefile +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + arch/x86/Kconfig | 20 +- + arch/x86/boot/compressed/Makefile | 16 +- + arch/x86/boot/compressed/head_32.S | 5 +- + arch/x86/boot/compressed/head_64.S | 5 +- + arch/x86/boot/compressed/misc.c | 13 +- + arch/x86/boot/compressed/mkpiggy.c | 9 +- + arch/x86/include/asm/fixmap.h | 4 +- + arch/x86/include/asm/highmem.h | 25 +- + arch/x86/include/asm/io_apic.h | 6 +- + arch/x86/include/asm/mce.h | 1 - + arch/x86/include/asm/mmu_context.h | 11 +- + arch/x86/include/asm/page_64.h | 4 +- + arch/x86/include/asm/pgtable_32_types.h | 2 +- + arch/x86/include/asm/preempt.h | 3 - + arch/x86/include/asm/switch_to.h | 12 +- + arch/x86/include/asm/uv/uv_bau.h | 4 +- + arch/x86/include/asm/vgtod.h | 19 ++ + arch/x86/include/asm/vsyscall.h | 33 +- + arch/x86/include/asm/vvar.h | 2 - + arch/x86/kernel/Makefile | 3 +- + arch/x86/kernel/acpi/boot.c | 87 ++++- + arch/x86/kernel/apic/io_apic.c | 244 +++++++++++--- + arch/x86/kernel/asm-offsets_64.c | 1 - + arch/x86/kernel/cpu/common.c | 10 - + arch/x86/kernel/cpu/mcheck/mce_amd.c | 54 ++-- + arch/x86/kernel/cpu/microcode/amd_early.c | 9 +- + arch/x86/kernel/cpuid.c | 2 +- + arch/x86/kernel/msr.c | 11 +- + arch/x86/kernel/setup.c | 2 - + arch/x86/kernel/sysfb.c | 2 +- + arch/x86/kernel/sysfb_simplefb.c | 5 +- + arch/x86/kernel/time.c | 2 +- + arch/x86/kernel/vsyscall_64.c | 146 ++++----- + arch/x86/mm/init_64.c | 49 --- + arch/x86/pci/acpi.c | 145 ++++----- + arch/x86/pci/intel_mid_pci.c | 10 +- + arch/x86/pci/irq.c | 7 +- + arch/x86/platform/uv/tlb_uv.c | 4 + + arch/x86/purgatory/Makefile | 1 + + arch/x86/tools/calc_run_size.pl | 30 ++ + arch/x86/vdso/vgetcpu.c | 2 - + arch/x86/vdso/vma.c | 83 +++-- + arch/x86/xen/mmu.c | 6 +- + drivers/acpi/Kconfig | 6 + + drivers/acpi/Makefile | 1 + + drivers/acpi/apei/ghes.c | 20 +- + drivers/acpi/internal.h | 7 + + drivers/acpi/ioapic.c | 235 ++++++++++++++ + drivers/acpi/pci_irq.c | 11 +- + drivers/acpi/pci_root.c | 3 + + drivers/acpi/processor_core.c | 132 +++++++- + drivers/acpi/resource.c | 2 +- + drivers/irqchip/irq-armada-370-xp.c | 23 +- + drivers/pci/Kconfig | 7 - + drivers/pci/Makefile | 2 - + drivers/pci/ioapic.c | 121 ------- + drivers/tty/n_tty.c | 17 +- + fs/notify/inotify/inotify_user.c | 9 +- + include/asm-generic/preempt.h | 3 - + include/linux/acpi.h | 5 + + include/linux/freezer.h | 50 --- + include/linux/kernel.h | 5 + + include/linux/pci.h | 1 + + include/linux/sched.h | 87 +++-- + include/linux/timekeeper_internal.h | 2 + + include/linux/timekeeping.h | 2 + + include/linux/wait.h | 80 ++++- + include/net/sock.h | 1 + + include/trace/events/sched.h | 9 +- + kernel/audit.c | 11 +- + kernel/cpuset.c | 23 +- + kernel/exit.c | 5 + + kernel/locking/mutex.c | 8 +- + kernel/module.c | 30 +- + kernel/sched/core.c | 236 ++++++++++---- + kernel/sched/deadline.c | 89 ++++- + kernel/sched/debug.c | 11 +- + kernel/sched/fair.c | 342 +++++++++++++++----- + kernel/sched/rt.c | 14 +- + kernel/sched/sched.h | 43 +++ + kernel/sched/wait.c | 66 ++++ + kernel/smpboot.c | 15 +- + kernel/time/timekeeping.c | 68 +++- + mm/memory-failure.c | 2 +- + net/bluetooth/rfcomm/core.c | 18 +- + net/core/dev.c | 10 +- + net/core/rtnetlink.c | 10 +- + tools/perf/Makefile.perf | 40 ++- + tools/perf/arch/powerpc/util/skip-callchain-idx.c | 38 ++- + tools/perf/builtin-inject.c | 4 +- + tools/perf/builtin-kvm.c | 25 ++ + tools/perf/builtin-probe.c | 65 ++-- + tools/perf/builtin-record.c | 7 +- + tools/perf/builtin-script.c | 8 +- + tools/perf/builtin-timechart.c | 9 +- + tools/perf/builtin-trace.c | 6 +- + tools/perf/config/Makefile | 29 +- + tools/perf/config/Makefile.arch | 8 + + tools/perf/config/feature-checks/Makefile | 10 +- + tools/perf/config/feature-checks/test-compile.c | 4 + + tools/perf/perf-read-vdso.c | 34 ++ + tools/perf/perf.h | 3 + + .../scripts/python/bin/export-to-postgresql-record | 8 + + .../scripts/python/bin/export-to-postgresql-report | 24 ++ + tools/perf/scripts/python/export-to-postgresql.py | 360 +++++++++++++++++++++ + tools/perf/tests/code-reading.c | 13 +- + tools/perf/tests/dwarf-unwind.c | 18 +- + tools/perf/tests/hists_filter.c | 2 +- + tools/perf/tests/mmap-thread-lookup.c | 2 +- + tools/perf/util/build-id.c | 3 +- + tools/perf/util/callchain.c | 4 +- + tools/perf/util/callchain.h | 6 +- + tools/perf/util/comm.h | 4 + + tools/perf/util/db-export.c | 270 ++++++++++++++++ + tools/perf/util/db-export.h | 86 +++++ + tools/perf/util/dso.h | 6 + + tools/perf/util/event.c | 20 +- + tools/perf/util/event.h | 16 +- + tools/perf/util/evlist.c | 28 +- + tools/perf/util/evsel.h | 5 + + tools/perf/util/find-vdso-map.c | 30 ++ + tools/perf/util/header.c | 7 +- + tools/perf/util/machine.c | 55 ++-- + tools/perf/util/machine.h | 17 +- + tools/perf/util/map.c | 8 +- + tools/perf/util/map.h | 4 +- + tools/perf/util/parse-options.c | 78 ++++- + tools/perf/util/parse-options.h | 4 + + tools/perf/util/pmu.c | 41 ++- + tools/perf/util/pmu.h | 1 + + tools/perf/util/probe-event.c | 18 +- + .../util/scripting-engines/trace-event-python.c | 292 ++++++++++++++++- + tools/perf/util/session.c | 141 +++++++- + tools/perf/util/session.h | 15 + + tools/perf/util/thread.c | 6 +- + tools/perf/util/thread.h | 6 +- + tools/perf/util/tool.h | 3 +- + tools/perf/util/unwind-libdw.c | 8 +- + tools/perf/util/unwind-libunwind.c | 17 +- + tools/perf/util/unwind.h | 2 - + tools/perf/util/vdso.c | 217 +++++++++++-- + tools/perf/util/vdso.h | 4 +- + 142 files changed, 3925 insertions(+), 1165 deletions(-) + create mode 100644 arch/x86/tools/calc_run_size.pl + create mode 100644 drivers/acpi/ioapic.c + delete mode 100644 drivers/pci/ioapic.c + create mode 100644 tools/perf/config/feature-checks/test-compile.c + create mode 100644 tools/perf/perf-read-vdso.c + create mode 100644 tools/perf/scripts/python/bin/export-to-postgresql-record + create mode 100644 tools/perf/scripts/python/bin/export-to-postgresql-report + create mode 100644 tools/perf/scripts/python/export-to-postgresql.py + create mode 100644 tools/perf/util/db-export.c + create mode 100644 tools/perf/util/db-export.h + create mode 100644 tools/perf/util/find-vdso-map.c +Merging clockevents/clockevents/next (b0ad5917960c ARM/ARM64: arch-timer: fix arch_timer_probed logic) +$ git merge clockevents/clockevents/next +Merge made by the 'recursive' strategy. +Merging edac/linux_next (d0585cd815fa sb_edac: Claim a different PCI device) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (bc4febe93c2f EDAC, MCE, AMD: Add decoding table for MC6 xec) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + arch/x86/kernel/amd_nb.c | 2 + + drivers/edac/amd64_edac.c | 255 ++++++++++++++++++++++++++++++-------------- + drivers/edac/amd64_edac.h | 15 ++- + drivers/edac/edac_mc.c | 40 +++---- + drivers/edac/mce_amd.c | 41 ++----- + drivers/edac/mv64x60_edac.c | 8 +- + drivers/edac/ppc4xx_edac.c | 4 +- + include/linux/edac.h | 4 +- + include/linux/pci_ids.h | 2 + + 9 files changed, 232 insertions(+), 139 deletions(-) +Merging irqchip/irqchip/for-next (8fbe8bc2d89b Merge branch 'irqchip/core' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Auto-merging drivers/irqchip/Kconfig +Merge made by the 'recursive' strategy. + drivers/irqchip/Kconfig | 1 + + drivers/irqchip/irq-hip04.c | 3 +-- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging tiny/tiny/next (d45461ff03ad Merge branches 'tiny/bloat-o-meter-no-SyS', 'tiny/more-procless', 'tiny/no-advice', 'tiny/tinyconfig' and 'tiny/x86-boot-compressed-use-yn' into tiny/next) +$ git merge tiny/tiny/next +Merge made by the 'recursive' strategy. +Merging ftrace/for-next (70c738a64478 Merge branch 'trace/ftrace/testing' into trace/for-next) +$ git merge ftrace/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging rcu/rcu/next (f120000b06ab Merge branch 'torture.2014.10.28d' into HEAD) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/ver_functions.sh +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT2-NH +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT1-nh +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT3-NH +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT1-nh +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/CFLIST +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/ver_functions.sh +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT2-NH +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT1-nh +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT3-NH +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT1-nh +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/CFLIST +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT2-NH +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT1-nh +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P6---t-nh-SD-smp-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT3-NH +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT1-nh +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/N6---t-nh-SD-smp-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp +Removing tools/testing/selftests/rcutortureRecorded preimage for 'drivers/md/dm.c' +/configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/CFLIST +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/ver_functions.sh +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT2-NH +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT1-nh +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT3-NH +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT1-nh +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP +Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/CFLIST +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/core.c +Auto-merging init/Kconfig +Auto-merging include/linux/sched.h +Auto-merging include/linux/rcupdate.h +Auto-merging drivers/md/dm.c +CONFLICT (content): Merge conflict in drivers/md/dm.c +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/md/dm.c'. +[master b0784f6085ca] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/rcu.txt | 4 +- + Documentation/RCU/stallwarn.txt | 14 +-- + Documentation/RCU/trace.txt | 4 +- + Documentation/RCU/whatisRCU.txt | 2 +- + Documentation/atomic_ops.txt | 12 ++- + Documentation/kernel-parameters.txt | 15 +++ + Documentation/memory-barriers.txt | 71 +++++++++++-- + include/linux/compiler.h | 2 +- + include/linux/init_task.h | 2 +- + include/linux/rcupdate.h | 19 ++-- + include/linux/rcutiny.h | 2 +- + include/linux/rcutree.h | 6 +- + include/linux/sched.h | 4 +- + include/trace/events/rcu.h | 4 +- + init/Kconfig | 49 ++++----- + kernel/cpu.c | 19 ++-- + kernel/fork.c | 5 +- + kernel/rcu/Makefile | 2 +- + kernel/rcu/rcu.h | 2 + + kernel/rcu/rcutorture.c | 1 + + kernel/rcu/tiny.c | 6 +- + kernel/rcu/tree.c | 97 ++++++++++-------- + kernel/rcu/tree.h | 22 ++-- + kernel/rcu/tree_plugin.h | 111 +++++++++++---------- + kernel/rcu/update.c | 89 ++++++++++++++++- + kernel/sched/core.c | 2 +- + kernel/signal.c | 42 ++++---- + kernel/softirq.c | 2 +- + kernel/time/tick-sched.c | 2 +- + kernel/time/timer.c | 3 +- + lib/Kconfig.debug | 14 +-- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 6 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 19 +--- + .../selftests/rcutorture/configs/rcu/TINY02 | 2 + + .../selftests/rcutorture/configs/rcu/TINY02.boot | 2 + + .../selftests/rcutorture/configs/rcu/TREE01 | 3 +- + .../selftests/rcutorture/configs/rcu/TREE02 | 3 +- + .../selftests/rcutorture/configs/rcu/TREE02-T | 3 +- + .../selftests/rcutorture/configs/rcu/TREE03 | 5 +- + .../selftests/rcutorture/configs/rcu/TREE04 | 1 - + .../selftests/rcutorture/configs/rcu/TREE05 | 1 - + .../selftests/rcutorture/configs/rcu/TREE05.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE06 | 1 - + .../selftests/rcutorture/configs/rcu/TREE06.boot | 3 + + .../selftests/rcutorture/configs/rcu/TREE07 | 1 - + .../selftests/rcutorture/configs/rcu/TREE08 | 5 +- + .../selftests/rcutorture/configs/rcu/TREE08-T | 3 +- + .../selftests/rcutorture/configs/rcu/TREE08.boot | 2 + + .../selftests/rcutorture/configs/rcu/TREE09 | 3 +- + .../selftests/rcutorture/configs/rcu/v0.0/CFLIST | 14 --- + .../configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP | 18 ---- + .../configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp | 20 ---- + .../configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp | 22 ---- + .../configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP | 18 ---- + .../configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp | 22 ---- + .../selftests/rcutorture/configs/rcu/v0.0/NT1-nh | 23 ----- + .../selftests/rcutorture/configs/rcu/v0.0/NT3-NH | 20 ---- + .../configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP | 19 ---- + .../configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp | 20 ---- + .../configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp | 20 ---- + .../configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP | 22 ---- + .../configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp | 27 ----- + .../selftests/rcutorture/configs/rcu/v0.0/PT1-nh | 23 ----- + .../selftests/rcutorture/configs/rcu/v0.0/PT2-NH | 22 ---- + .../rcutorture/configs/rcu/v0.0/ver_functions.sh | 33 ------ + .../selftests/rcutorture/configs/rcu/v3.12/CFLIST | 17 ---- + .../configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP | 19 ---- + .../configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp | 20 ---- + .../configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp | 22 ---- + .../configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP | 18 ---- + .../configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp | 22 ---- + .../configs/rcu/v3.12/N6---t-nh-SD-smp-hp | 19 ---- + .../configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP | 26 ----- + .../configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP | 22 ---- + .../selftests/rcutorture/configs/rcu/v3.12/NT1-nh | 23 ----- + .../selftests/rcutorture/configs/rcu/v3.12/NT3-NH | 20 ---- + .../configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP | 20 ---- + .../configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp | 20 ---- + .../configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp | 20 ---- + .../configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP | 22 ---- + .../configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp | 27 ----- + .../configs/rcu/v3.12/P6---t-nh-SD-smp-hp | 18 ---- + .../configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP | 30 ------ + .../configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all | 30 ------ + .../configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none | 30 ------ + .../configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp | 30 ------ + .../selftests/rcutorture/configs/rcu/v3.12/PT1-nh | 23 ----- + .../selftests/rcutorture/configs/rcu/v3.12/PT2-NH | 22 ---- + .../selftests/rcutorture/configs/rcu/v3.3/CFLIST | 14 --- + .../configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP | 19 ---- + .../configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp | 20 ---- + .../configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp | 22 ---- + .../configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP | 18 ---- + .../configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp | 22 ---- + .../selftests/rcutorture/configs/rcu/v3.3/NT1-nh | 23 ----- + .../selftests/rcutorture/configs/rcu/v3.3/NT3-NH | 20 ---- + .../configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP | 20 ---- + .../configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp | 20 ---- + .../configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp | 20 ---- + .../configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP | 22 ---- + .../configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp | 27 ----- + .../selftests/rcutorture/configs/rcu/v3.3/PT1-nh | 23 ----- + .../selftests/rcutorture/configs/rcu/v3.3/PT2-NH | 22 ---- + .../rcutorture/configs/rcu/v3.3/ver_functions.sh | 44 -------- + .../selftests/rcutorture/configs/rcu/v3.5/CFLIST | 14 --- + .../configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP | 19 ---- + .../configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp | 20 ---- + .../configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp | 22 ---- + .../configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP | 18 ---- + .../configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp | 22 ---- + .../selftests/rcutorture/configs/rcu/v3.5/NT1-nh | 23 ----- + .../selftests/rcutorture/configs/rcu/v3.5/NT3-NH | 20 ---- + .../configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP | 20 ---- + .../configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp | 20 ---- + .../configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp | 20 ---- + .../configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP | 22 ---- + .../configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp | 27 ----- + .../selftests/rcutorture/configs/rcu/v3.5/PT1-nh | 23 ----- + .../selftests/rcutorture/configs/rcu/v3.5/PT2-NH | 22 ---- + .../rcutorture/configs/rcu/v3.5/ver_functions.sh | 57 ----------- + .../testing/selftests/rcutorture/doc/TINY_RCU.txt | 2 +- + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 15 ++- + 122 files changed, 439 insertions(+), 1859 deletions(-) + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TINY02.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE06.boot + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/CFLIST + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT1-nh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT3-NH + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT1-nh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT2-NH + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/ver_functions.sh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/CFLIST + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N6---t-nh-SD-smp-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT1-nh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT3-NH + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P6---t-nh-SD-smp-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT1-nh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT2-NH + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/CFLIST + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT1-nh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT3-NH + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT1-nh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT2-NH + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/ver_functions.sh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/CFLIST + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT1-nh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT3-NH + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT1-nh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT2-NH + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/ver_functions.sh +Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (c6338ce49445 kvm: kvmclock: use get_cpu() and put_cpu()) +$ git merge kvm/linux-next +Auto-merging arch/s390/mm/pgtable.c +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 40 +++++- + Documentation/virtual/kvm/msr.txt | 2 +- + arch/s390/include/asm/kvm_host.h | 9 ++ + arch/s390/include/asm/sigp.h | 1 + + arch/s390/kvm/gaccess.c | 20 ++- + arch/s390/kvm/interrupt.c | 2 +- + arch/s390/kvm/kvm-s390.c | 8 ++ + arch/s390/kvm/sigp.c | 269 ++++++++++++++++++++------------------ + arch/s390/mm/pgtable.c | 2 +- + arch/x86/include/asm/kvm_host.h | 3 +- + arch/x86/include/asm/xsave.h | 1 + + arch/x86/kernel/kvmclock.c | 19 ++- + arch/x86/kvm/cpuid.c | 3 +- + arch/x86/kvm/emulate.c | 96 +++++++------- + arch/x86/kvm/lapic.c | 107 +++++++++------ + arch/x86/kvm/lapic.h | 12 +- + arch/x86/kvm/svm.c | 10 +- + arch/x86/kvm/vmx.c | 23 ++-- + arch/x86/kvm/x86.c | 58 ++++---- + arch/x86/kvm/x86.h | 3 +- + include/uapi/linux/kvm.h | 8 -- + virt/kvm/ioapic.h | 2 +- + virt/kvm/kvm_main.c | 2 +- + 23 files changed, 386 insertions(+), 314 deletions(-) +Merging kvm-arm/next (f62c95fd4041 Merge tag 'kvm-s390-next-20141028' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (8d0eff638564 KVM: PPC: Pass enum to kvmppc_get_last_inst) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) +$ git merge oprofile/for-next +Already up-to-date. +Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) +$ git merge fw-nohz/nohz/next +Already up-to-date. +Merging xen-tip/linux-next (63401a5dca18 Merge branch 'hypercall_cache_flush_v5' into xentip-linux-next-7) +$ git merge xen-tip/linux-next +Removing arch/arm/xen/mm32.c +Merge made by the 'recursive' strategy. + arch/arm/include/asm/xen/page-coherent.h | 5 + + arch/arm/include/asm/xen/page.h | 4 + + arch/arm/xen/Makefile | 2 +- + arch/arm/xen/enlighten.c | 5 - + arch/arm/xen/mm.c | 160 +++++++++++++++++++++++ + arch/arm/xen/mm32.c | 202 ----------------------------- + arch/arm64/include/asm/xen/page-coherent.h | 25 ++-- + arch/x86/include/asm/xen/page.h | 7 + + drivers/xen/swiotlb-xen.c | 5 +- + include/xen/interface/features.h | 3 - + include/xen/interface/grant_table.h | 19 +++ + 11 files changed, 213 insertions(+), 224 deletions(-) + delete mode 100644 arch/arm/xen/mm32.c +Merging percpu/for-next (56e4dea81a55 percpu: Convert remaining __get_cpu_var uses in 3.18-rcX) +$ git merge percpu/for-next +Auto-merging kernel/time/tick-sched.c +Merge made by the 'recursive' strategy. + arch/arm64/kernel/psci.c | 4 ++-- + kernel/irq_work.c | 4 ++-- + kernel/time/tick-sched.c | 2 +- + mm/percpu.c | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) +Merging workqueues/for-next (e09c2c295468 workqueue: apply __WQ_ORDERED to create_singlethread_workqueue()) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/for-next (725c7f619e20 quirk for Lenovo Yoga 3: no rfkill switch) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (46f6c620e8a1 Merge remote-tracking branches 'regmap/topic/cache' and 'regmap/topic/headers' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regcache-flat.c | 2 +- + drivers/base/regmap/regcache-lzo.c | 2 +- + drivers/base/regmap/regcache-rbtree.c | 4 +-- + drivers/base/regmap/regcache.c | 63 +++++++++++++++++++---------------- + 4 files changed, 38 insertions(+), 33 deletions(-) +Merging hsi/for-next (a26a42508157 HSI: remove deprecated IRQF_DISABLED) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/clients/nokia-modem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging leds/for-next (33faa112cef4 leds: implement sysfs interface locking mechanism) +$ git merge leds/for-next +Auto-merging include/linux/leds.h +Merge made by the 'recursive' strategy. + drivers/leds/led-class.c | 19 ++++++++++-- + drivers/leds/led-core.c | 18 +++++++++++ + drivers/leds/led-triggers.c | 16 ++++++++-- + drivers/leds/leds-regulator.c | 18 +++-------- + drivers/leds/leds-syscon.c | 71 ++++++++++++++++++++++--------------------- + include/linux/leds.h | 32 +++++++++++++++++++ + 6 files changed, 120 insertions(+), 54 deletions(-) +Merging ipmi/for-next (ef4a48c51321 Merge tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linux) +$ git merge ipmi/for-next +Already up-to-date. +Merging driver-core/driver-core-next (0df1f2487d2f Linux 3.18-rc3) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (0df1f2487d2f Linux 3.18-rc3) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (d9c3ae28bd6b uwb: Remove bogus colon after newline from debug message) +$ git merge usb/usb-next +Resolved 'drivers/usb/host/Kconfig' using previous resolution. +Auto-merging drivers/usb/host/Kconfig +CONFLICT (content): Merge conflict in drivers/usb/host/Kconfig +Auto-merging drivers/usb/core/hub.c +Auto-merging drivers/usb/class/cdc-acm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d572bf0101fa] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/usb/usb-ohci.txt | 2 + + drivers/usb/chipidea/host.c | 67 +++++++++++++++------- + drivers/usb/chipidea/otg_fsm.c | 10 +--- + drivers/usb/class/cdc-acm.c | 7 --- + drivers/usb/class/cdc-acm.h | 1 - + drivers/usb/class/usbtmc.c | 4 +- + drivers/usb/core/hub.c | 18 +++--- + drivers/usb/host/ehci-exynos.c | 1 - + drivers/usb/host/ehci-hcd.c | 9 ++- + drivers/usb/host/ehci-hub.c | 45 ++++++++++----- + drivers/usb/host/ehci-mv.c | 1 - + drivers/usb/host/ehci-platform.c | 15 ++--- + drivers/usb/host/ehci-sh.c | 1 - + drivers/usb/host/ehci-tegra.c | 1 - + drivers/usb/host/ehci.h | 2 + + drivers/usb/host/imx21-hcd.c | 6 +- + drivers/usb/host/ohci-at91.c | 4 -- + drivers/usb/host/ohci-exynos.c | 1 - + drivers/usb/host/ohci-platform.c | 40 +++++-------- + drivers/usb/host/ohci.h | 19 +++--- + drivers/usb/host/oxu210hp-hcd.c | 1 - + drivers/usb/misc/usb3503.c | 8 +-- + drivers/usb/misc/yurex.c | 6 +- + drivers/usb/renesas_usbhs/common.c | 4 +- + drivers/usb/storage/debug.c | 7 +-- + drivers/usb/storage/debug.h | 10 ++-- + drivers/usb/storage/uas.c | 64 ++++++++------------- + drivers/uwb/rsv.c | 4 +- + include/linux/usb/hcd.h | 3 + + 29 files changed, 174 insertions(+), 187 deletions(-) +Merging usb-gadget/next (c3761a79c14d usb: dwc2: allow dwc2 to get built when USB_GADGET=m) +$ git merge usb-gadget/next +Recorded preimage for 'drivers/usb/chipidea/otg_fsm.c' +Auto-merging include/linux/pci_ids.h +Auto-merging drivers/usb/renesas_usbhs/common.c +Auto-merging drivers/usb/dwc2/gadget.c +Auto-merging drivers/usb/core/hcd.c +Auto-merging drivers/usb/chipidea/otg_fsm.c +CONFLICT (content): Merge conflict in drivers/usb/chipidea/otg_fsm.c +Auto-merging drivers/usb/chipidea/host.c +Auto-merging drivers/phy/phy-omap-usb2.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/usb/chipidea/otg_fsm.c'. +[master 216c93c24f59] Merge remote-tracking branch 'usb-gadget/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-class-udc | 93 ++++++++ + Documentation/devicetree/bindings/usb/dwc3.txt | 23 ++ + Documentation/devicetree/bindings/usb/pxa-usb.txt | 22 ++ + drivers/pci/quirks.c | 20 ++ + drivers/phy/phy-omap-usb2.c | 14 +- + drivers/usb/chipidea/ci.h | 8 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 2 +- + drivers/usb/chipidea/ci_hdrc_msm.c | 8 +- + drivers/usb/chipidea/core.c | 89 ++++++-- + drivers/usb/chipidea/debug.c | 2 +- + drivers/usb/chipidea/host.c | 10 +- + drivers/usb/chipidea/otg_fsm.c | 27 ++- + drivers/usb/chipidea/udc.c | 10 +- + drivers/usb/common/usb-otg-fsm.c | 8 +- + drivers/usb/core/hcd.c | 7 +- + drivers/usb/dwc2/Kconfig | 2 +- + drivers/usb/dwc2/gadget.c | 57 +++-- + drivers/usb/dwc3/core.c | 251 +++++++++++++++++----- + drivers/usb/dwc3/core.h | 89 ++++++-- + drivers/usb/dwc3/dwc3-keystone.c | 5 - + drivers/usb/dwc3/dwc3-omap.c | 20 +- + drivers/usb/dwc3/dwc3-pci.c | 35 +++ + drivers/usb/dwc3/ep0.c | 24 ++- + drivers/usb/dwc3/gadget.c | 51 +++-- + drivers/usb/dwc3/platform_data.h | 20 ++ + drivers/usb/dwc3/trace.h | 8 +- + drivers/usb/gadget/composite.c | 64 +++++- + drivers/usb/gadget/configfs.c | 5 +- + drivers/usb/gadget/function/f_ncm.c | 3 + + drivers/usb/gadget/function/u_uac1.c | 3 - + drivers/usb/gadget/udc/amd5536udc.c | 10 +- + drivers/usb/gadget/udc/at91_udc.c | 9 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 11 +- + drivers/usb/gadget/udc/bcm63xx_udc.c | 7 +- + drivers/usb/gadget/udc/dummy_hcd.c | 15 +- + drivers/usb/gadget/udc/fotg210-udc.c | 3 +- + drivers/usb/gadget/udc/fsl_qe_udc.c | 11 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 8 +- + drivers/usb/gadget/udc/fusb300_udc.c | 3 +- + drivers/usb/gadget/udc/goku_udc.c | 6 +- + drivers/usb/gadget/udc/gr_udc.c | 8 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 8 +- + drivers/usb/gadget/udc/m66592-udc.c | 3 +- + drivers/usb/gadget/udc/mv_u3d_core.c | 5 +- + drivers/usb/gadget/udc/mv_udc_core.c | 13 +- + drivers/usb/gadget/udc/net2272.c | 21 +- + drivers/usb/gadget/udc/net2280.c | 18 +- + drivers/usb/gadget/udc/omap_udc.c | 6 +- + drivers/usb/gadget/udc/pch_udc.c | 7 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 8 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 150 ++++++------- + drivers/usb/gadget/udc/pxa27x_udc.h | 6 +- + drivers/usb/gadget/udc/r8a66597-udc.c | 8 +- + drivers/usb/gadget/udc/s3c-hsudc.c | 16 +- + drivers/usb/gadget/udc/s3c2410_udc.c | 6 +- + drivers/usb/gadget/udc/udc-core.c | 28 ++- + drivers/usb/gadget/udc/udc-xilinx.c | 3 +- + drivers/usb/host/ohci-omap.c | 2 +- + drivers/usb/musb/am35x.c | 28 +-- + drivers/usb/musb/blackfin.c | 26 +-- + drivers/usb/musb/da8xx.c | 28 +-- + drivers/usb/musb/davinci.c | 22 +- + drivers/usb/musb/musb_core.c | 102 ++++----- + drivers/usb/musb/musb_dsps.c | 36 ++-- + drivers/usb/musb/musb_gadget.c | 49 ++--- + drivers/usb/musb/musb_host.c | 8 +- + drivers/usb/musb/musb_virthub.c | 22 +- + drivers/usb/musb/omap2430.c | 52 ++--- + drivers/usb/musb/tusb6010.c | 44 ++-- + drivers/usb/musb/ux500.c | 14 +- + drivers/usb/musb/ux500_dma.c | 7 +- + drivers/usb/phy/phy-ab8500-usb.c | 16 +- + drivers/usb/phy/phy-am335x-control.c | 4 +- + drivers/usb/phy/phy-fsl-usb.c | 23 +- + drivers/usb/phy/phy-generic.c | 6 +- + drivers/usb/phy/phy-gpio-vbus-usb.c | 14 +- + drivers/usb/phy/phy-isp1301-omap.c | 104 ++++----- + drivers/usb/phy/phy-msm-usb.c | 107 +++++---- + drivers/usb/phy/phy-mv-usb.c | 54 +++-- + drivers/usb/phy/phy-mxs-usb.c | 4 +- + drivers/usb/phy/phy-rcar-gen2-usb.c | 4 +- + drivers/usb/phy/phy-rcar-usb.c | 12 +- + drivers/usb/phy/phy-tahvo.c | 32 +-- + drivers/usb/phy/phy-tegra-usb.c | 9 +- + drivers/usb/phy/phy-ulpi.c | 6 +- + drivers/usb/renesas_usbhs/common.c | 4 +- + drivers/usb/renesas_usbhs/common.h | 3 +- + drivers/usb/renesas_usbhs/mod_gadget.c | 3 +- + drivers/usb/renesas_usbhs/rcar2.c | 73 +++++-- + include/linux/pci_ids.h | 1 + + include/linux/usb/chipidea.h | 4 +- + include/linux/usb/composite.h | 7 + + include/linux/usb/gadget.h | 5 +- + include/linux/usb/otg.h | 7 +- + include/linux/usb/phy.h | 1 - + 95 files changed, 1352 insertions(+), 968 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-class-udc +Merging usb-serial/usb-next (679315e5fae1 USB: serial: add Google simple serial SubClass support) +$ git merge usb-serial/usb-next +Auto-merging drivers/usb/serial/usb-serial-simple.c +Auto-merging drivers/usb/serial/kobil_sct.c +Merge made by the 'recursive' strategy. + Documentation/usb/usb-serial.txt | 2 +- + drivers/usb/serial/Kconfig | 5 +++-- + drivers/usb/serial/keyspan_pda.c | 16 ++++++++-------- + drivers/usb/serial/kobil_sct.c | 2 +- + drivers/usb/serial/mos7720.c | 4 ++-- + drivers/usb/serial/mos7840.c | 4 ++-- + drivers/usb/serial/usb-serial-simple.c | 10 ++++++++++ + 7 files changed, 27 insertions(+), 16 deletions(-) +Merging staging/staging-next (be61a0d78449 Merge tag 'iio-for-3.19a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) +$ git merge staging/staging-next +Auto-merging include/uapi/linux/android/binder.h +Auto-merging include/uapi/linux/Kbuild +Removing drivers/staging/vt6655/wroute.h +Removing drivers/staging/vt6655/wroute.c +Removing drivers/staging/vt6655/wpactl.h +Removing drivers/staging/vt6655/wpactl.c +Removing drivers/staging/vt6655/wpa2.h +Removing drivers/staging/vt6655/wpa2.c +Removing drivers/staging/vt6655/wpa.h +Removing drivers/staging/vt6655/wpa.c +Removing drivers/staging/vt6655/wmgr.h +Removing drivers/staging/vt6655/wmgr.c +Removing drivers/staging/vt6655/wctl.h +Removing drivers/staging/vt6655/wctl.c +Removing drivers/staging/vt6655/wcmd.h +Removing drivers/staging/vt6655/wcmd.c +Removing drivers/staging/vt6655/vntwifi.h +Removing drivers/staging/vt6655/vntwifi.c +Removing drivers/staging/vt6655/vntconfiguration.dat +Removing drivers/staging/vt6655/ttype.h +Removing drivers/staging/vt6655/tkip.h +Removing drivers/staging/vt6655/tkip.c +Removing drivers/staging/vt6655/tether.h +Removing drivers/staging/vt6655/tether.c +Removing drivers/staging/vt6655/tcrc.h +Removing drivers/staging/vt6655/tcrc.c +Removing drivers/staging/vt6655/rc4.h +Removing drivers/staging/vt6655/rc4.c +Removing drivers/staging/vt6655/michael.h +Removing drivers/staging/vt6655/michael.c +Removing drivers/staging/vt6655/iwctl.h +Removing drivers/staging/vt6655/iwctl.c +Removing drivers/staging/vt6655/iowpa.h +Removing drivers/staging/vt6655/ioctl.h +Removing drivers/staging/vt6655/ioctl.c +Removing drivers/staging/vt6655/iocmd.h +Removing drivers/staging/vt6655/hostap.h +Removing drivers/staging/vt6655/hostap.c +Removing drivers/staging/vt6655/datarate.h +Removing drivers/staging/vt6655/datarate.c +Removing drivers/staging/vt6655/country.h +Removing drivers/staging/vt6655/bssdb.h +Removing drivers/staging/vt6655/bssdb.c +Removing drivers/staging/vt6655/aes_ccmp.h +Removing drivers/staging/vt6655/aes_ccmp.c +Removing drivers/staging/vt6655/IEEE11h.h +Removing drivers/staging/vt6655/IEEE11h.c +Removing drivers/staging/vt6655/80211mgr.h +Removing drivers/staging/vt6655/80211mgr.c +Removing drivers/staging/vt6655/80211hdr.h +Auto-merging drivers/staging/skein/skein_base.h +Auto-merging drivers/staging/skein/skein_base.c +Auto-merging drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c +Auto-merging drivers/staging/media/lirc/lirc_zilog.c +Auto-merging drivers/staging/media/lirc/lirc_sasem.c +CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/staging/media/lirc/lirc_imon.c +CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_imon.c +CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_igorplugusb.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_igorplugusb.c left in tree. +Auto-merging drivers/staging/lustre/lustre/llite/xattr.c +Auto-merging drivers/staging/lustre/lustre/llite/vvp_io.c +Auto-merging drivers/staging/lustre/lustre/llite/statahead.c +Auto-merging drivers/staging/lustre/lustre/llite/namei.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/namei.c +Auto-merging drivers/staging/lustre/lustre/llite/lloop.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_lib.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_lib.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h +Auto-merging drivers/staging/lustre/lustre/llite/file.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/file.c +Auto-merging drivers/staging/lustre/lustre/llite/dir.c +Removing drivers/staging/comedi/drivers/addi_apci_3200.c +Removing drivers/staging/comedi/drivers/addi_apci_035.c +Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c +Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +Removing drivers/staging/comedi/drivers/addi-data/addi_eeprom.c +Removing drivers/staging/comedi/drivers/addi-data/addi_common.h +Removing drivers/staging/comedi/drivers/addi-data/addi_common.c +Removing drivers/staging/bcm/vendorspecificextn.h +Removing drivers/staging/bcm/vendorspecificextn.c +Removing drivers/staging/bcm/target_params.h +ReResolved 'drivers/staging/lustre/lustre/llite/file.c' using previous resolution. +Resolved 'drivers/staging/lustre/lustre/llite/llite_lib.c' using previous resolution. +Resolved 'drivers/staging/lustre/lustre/llite/namei.c' using previous resolution. +Resolved 'drivers/staging/media/lirc/lirc_imon.c' using previous resolution. +Resolved 'drivers/staging/media/lirc/lirc_sasem.c' using previous resolution. +moving drivers/staging/bcm/sort.c +Removing drivers/staging/bcm/nvm.h +Removing drivers/staging/bcm/nvm.c +Removing drivers/staging/bcm/led_control.h +Removing drivers/staging/bcm/led_control.c +Removing drivers/staging/bcm/hostmibs.c +Removing drivers/staging/bcm/headers.h +Removing drivers/staging/bcm/cntrl_SignalingInterface.h +Removing drivers/staging/bcm/Typedefs.h +Removing drivers/staging/bcm/Transmit.c +Removing drivers/staging/bcm/TODO +Removing drivers/staging/bcm/Queue.h +Removing drivers/staging/bcm/Qos.c +Removing drivers/staging/bcm/Prototypes.h +Removing drivers/staging/bcm/Protocol.h +Removing drivers/staging/bcm/PHSModule.h +Removing drivers/staging/bcm/PHSModule.c +Removing drivers/staging/bcm/PHSDefines.h +Removing drivers/staging/bcm/Misc.c +Removing drivers/staging/bcm/Makefile +Removing drivers/staging/bcm/Macros.h +Removing drivers/staging/bcm/LeakyBucket.c +Removing drivers/staging/bcm/Kconfig +Removing drivers/staging/bcm/Ioctl.h +Removing drivers/staging/bcm/InterfaceTx.h +Removing drivers/staging/bcm/InterfaceTx.c +Removing drivers/staging/bcm/InterfaceRx.h +Removing drivers/staging/bcm/InterfaceRx.c +Removing drivers/staging/bcm/InterfaceMisc.h +Removing drivers/staging/bcm/InterfaceMisc.c +Removing drivers/staging/bcm/InterfaceMacros.h +Removing drivers/staging/bcm/InterfaceIsr.h +Removing drivers/staging/bcm/InterfaceIsr.c +Removing drivers/staging/bcm/InterfaceInit.h +Removing drivers/staging/bcm/InterfaceInit.c +Removing drivers/staging/bcm/InterfaceIdleMode.h +Removing drivers/staging/bcm/InterfaceIdleMode.c +Removing drivers/staging/bcm/InterfaceDld.c +Removing drivers/staging/bcm/InterfaceAdapter.h +Removing drivers/staging/bcm/IPv6ProtocolHdr.h +Removing drivers/staging/bcm/IPv6Protocol.c +Removing drivers/staging/bcm/HostMIBSInterface.h +Removing drivers/staging/bcm/HandleControlPacket.c +Removing drivers/staging/bcm/Debug.h +Removing drivers/staging/bcm/DDRInit.h +Removing drivers/staging/bcm/DDRInit.c +Removing drivers/staging/bcm/CmHost.h +Removing drivers/staging/bcm/CmHost.c +Removing drivers/staging/bcm/Bcmnet.c +Removing drivers/staging/bcm/Bcmchar.c +Removing drivers/staging/bcm/Adapter.h +Removing drivers/staging/android/binder.h +Auto-merging drivers/iio/proximity/as3935.c +Auto-merging drivers/android/binder.c +Auto-merging arch/arm/boot/dts/exynos5250.dtsi +Auto-merging arch/arm/boot/dts/exynos3250.dtsi +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/media/lirc/lirc_igorplugusb.c +drivers/staging/media/lirc/lirc_igorplugusb.c: needs merge +rm 'drivers/staging/media/lirc/lirc_igorplugusb.c' +$ git commit -v -a +[master ca56ccd8618f] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + .gitignore | 4 + + Documentation/ABI/testing/sysfs-bus-iio | 23 + + .../devicetree/bindings/arm/samsung/exynos-adc.txt | 11 +- + .../devicetree/bindings/iio/adc/qcom,spmi-iadc.txt | 46 + + .../bindings/iio/adc/rockchip-saradc.txt | 2 +- + MAINTAINERS | 7 - + arch/arm/boot/dts/exynos3250.dtsi | 3 +- + arch/arm/boot/dts/exynos4x12.dtsi | 3 +- + arch/arm/boot/dts/exynos5250.dtsi | 3 +- + arch/arm/boot/dts/exynos5420.dtsi | 3 +- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/android/Kconfig | 37 + + drivers/android/Makefile | 3 + + drivers/{staging => }/android/binder.c | 6 +- + drivers/{staging => }/android/binder_trace.h | 0 + drivers/iio/accel/st_accel.h | 3 +- + drivers/iio/accel/st_accel_core.c | 22 +- + drivers/iio/accel/st_accel_i2c.c | 3 +- + drivers/iio/accel/st_accel_spi.c | 3 +- + drivers/iio/adc/Kconfig | 14 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/exynos_adc.c | 62 +- + drivers/iio/adc/mcp320x.c | 222 +- + drivers/iio/adc/qcom-spmi-iadc.c | 595 ++ + drivers/iio/adc/rockchip_saradc.c | 64 +- + drivers/iio/adc/vf610_adc.c | 45 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 126 +- + drivers/iio/common/st_sensors/st_sensors_i2c.c | 1 + + drivers/iio/common/st_sensors/st_sensors_spi.c | 1 + + drivers/iio/gyro/st_gyro.h | 3 +- + drivers/iio/gyro/st_gyro_core.c | 19 +- + drivers/iio/gyro/st_gyro_i2c.c | 4 +- + drivers/iio/gyro/st_gyro_spi.c | 4 +- + drivers/iio/humidity/Kconfig | 10 + + drivers/iio/humidity/Makefile | 1 + + drivers/iio/humidity/si7020.c | 161 + + drivers/iio/inkern.c | 33 +- + drivers/iio/magnetometer/st_magn.h | 3 +- + drivers/iio/magnetometer/st_magn_core.c | 18 +- + drivers/iio/magnetometer/st_magn_i2c.c | 3 +- + drivers/iio/magnetometer/st_magn_spi.c | 3 +- + drivers/iio/pressure/Kconfig | 11 + + drivers/iio/pressure/Makefile | 1 + + drivers/iio/pressure/bmp280.c | 455 + + drivers/iio/pressure/st_pressure.h | 3 +- + drivers/iio/pressure/st_pressure_buffer.c | 12 +- + drivers/iio/pressure/st_pressure_core.c | 49 +- + drivers/iio/pressure/st_pressure_i2c.c | 11 +- + drivers/iio/pressure/st_pressure_spi.c | 11 +- + drivers/iio/proximity/as3935.c | 16 +- + drivers/staging/Kconfig | 4 +- + drivers/staging/Makefile | 2 +- + drivers/staging/android/Kconfig | 30 - + drivers/staging/android/Makefile | 1 - + drivers/staging/android/TODO | 7 + + drivers/staging/android/binder.h | 30 - + drivers/staging/android/ion/ion.c | 4 +- + drivers/staging/android/ion/ion.h | 2 +- + drivers/staging/android/ion/ion_page_pool.c | 2 +- + drivers/staging/android/ion/ion_priv.h | 4 +- + drivers/staging/android/sync_debug.c | 5 +- + drivers/staging/android/timed_gpio.c | 7 +- + drivers/staging/bcm/Adapter.h | 474 - + drivers/staging/bcm/Bcmchar.c | 2652 ----- + drivers/staging/bcm/Bcmnet.c | 240 - + drivers/staging/bcm/CmHost.c | 2254 ---- + drivers/staging/bcm/CmHost.h | 62 - + drivers/staging/bcm/DDRInit.c | 1355 --- + drivers/staging/bcm/DDRInit.h | 9 - + drivers/staging/bcm/Debug.h | 242 - + drivers/staging/bcm/HandleControlPacket.c | 241 - + drivers/staging/bcm/HostMIBSInterface.h | 192 - + drivers/staging/bcm/IPv6Protocol.c | 476 - + drivers/staging/bcm/IPv6ProtocolHdr.h | 85 - + drivers/staging/bcm/InterfaceAdapter.h | 79 - + drivers/staging/bcm/InterfaceDld.c | 317 - + drivers/staging/bcm/InterfaceIdleMode.c | 274 - + drivers/staging/bcm/InterfaceIdleMode.h | 15 - + drivers/staging/bcm/InterfaceInit.c | 729 -- + drivers/staging/bcm/InterfaceInit.h | 26 - + drivers/staging/bcm/InterfaceIsr.c | 190 - + drivers/staging/bcm/InterfaceIsr.h | 15 - + drivers/staging/bcm/InterfaceMacros.h | 18 - + drivers/staging/bcm/InterfaceMisc.c | 247 - + drivers/staging/bcm/InterfaceMisc.h | 42 - + drivers/staging/bcm/InterfaceRx.c | 289 - + drivers/staging/bcm/InterfaceRx.h | 7 - + drivers/staging/bcm/InterfaceTx.c | 213 - + drivers/staging/bcm/InterfaceTx.h | 7 - + drivers/staging/bcm/Ioctl.h | 226 - + drivers/staging/bcm/Kconfig | 6 - + drivers/staging/bcm/LeakyBucket.c | 364 - + drivers/staging/bcm/Macros.h | 352 - + drivers/staging/bcm/Makefile | 12 - + drivers/staging/bcm/Misc.c | 1587 --- + drivers/staging/bcm/PHSDefines.h | 94 - + drivers/staging/bcm/PHSModule.c | 1703 --- + drivers/staging/bcm/PHSModule.h | 59 - + drivers/staging/bcm/Protocol.h | 128 - + drivers/staging/bcm/Prototypes.h | 217 - + drivers/staging/bcm/Qos.c | 1200 --- + drivers/staging/bcm/Queue.h | 29 - + drivers/staging/bcm/TODO | 26 - + drivers/staging/bcm/Transmit.c | 271 - + drivers/staging/bcm/Typedefs.h | 47 - + drivers/staging/bcm/cntrl_SignalingInterface.h | 311 - + drivers/staging/bcm/headers.h | 78 - + drivers/staging/bcm/hostmibs.c | 164 - + drivers/staging/bcm/led_control.c | 952 -- + drivers/staging/bcm/led_control.h | 84 - + drivers/staging/bcm/nvm.c | 4661 -------- + drivers/staging/bcm/nvm.h | 286 - + drivers/staging/bcm/sort.c | 52 - + drivers/staging/bcm/target_params.h | 57 - + drivers/staging/bcm/vendorspecificextn.c | 145 - + drivers/staging/bcm/vendorspecificextn.h | 18 - + drivers/staging/clocking-wizard/Kconfig | 9 + + drivers/staging/clocking-wizard/Makefile | 1 + + drivers/staging/clocking-wizard/TODO | 12 + + .../clocking-wizard/clk-xlnx-clock-wizard.c | 335 + + drivers/staging/clocking-wizard/dt-binding.txt | 30 + + drivers/staging/comedi/Kconfig | 12 +- + drivers/staging/comedi/comedi.h | 11 - + drivers/staging/comedi/comedi_buf.c | 156 +- + drivers/staging/comedi/comedi_fops.c | 62 +- + drivers/staging/comedi/comedidev.h | 95 +- + drivers/staging/comedi/drivers.c | 16 +- + drivers/staging/comedi/drivers/Makefile | 1 - + .../staging/comedi/drivers/addi-data/addi_common.c | 274 - + .../staging/comedi/drivers/addi-data/addi_common.h | 144 - + .../staging/comedi/drivers/addi-data/addi_eeprom.c | 360 - + .../comedi/drivers/addi-data/hwdrv_apci035.c | 480 - + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 28 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 36 +- + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 567 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 3003 ------ + drivers/staging/comedi/drivers/addi_apci_035.c | 77 - + drivers/staging/comedi/drivers/addi_apci_1032.c | 5 +- + drivers/staging/comedi/drivers/addi_apci_1500.c | 117 +- + drivers/staging/comedi/drivers/addi_apci_1516.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_1564.c | 20 +- + drivers/staging/comedi/drivers/addi_apci_16xx.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_2032.c | 17 +- + drivers/staging/comedi/drivers/addi_apci_2200.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_3120.c | 305 +- + drivers/staging/comedi/drivers/addi_apci_3200.c | 125 - + drivers/staging/comedi/drivers/addi_apci_3501.c | 6 +- + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 10 +- + drivers/staging/comedi/drivers/addi_watchdog.c | 2 +- + drivers/staging/comedi/drivers/adl_pci9111.c | 21 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 34 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 52 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 2 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 8 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 22 +- + .../staging/comedi/drivers/amplc_pc236_common.c | 5 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 2 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 11 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 100 +- + drivers/staging/comedi/drivers/amplc_pci263.c | 2 +- + drivers/staging/comedi/drivers/c6xdigio.c | 2 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 66 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 107 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 82 +- + drivers/staging/comedi/drivers/comedi_bond.c | 9 +- + drivers/staging/comedi/drivers/comedi_fc.h | 43 - + drivers/staging/comedi/drivers/comedi_parport.c | 5 +- + drivers/staging/comedi/drivers/comedi_test.c | 46 +- + drivers/staging/comedi/drivers/das08.c | 2 +- + drivers/staging/comedi/drivers/das16.c | 22 +- + drivers/staging/comedi/drivers/das16m1.c | 7 +- + drivers/staging/comedi/drivers/das1800.c | 16 +- + drivers/staging/comedi/drivers/das6402.c | 4 +- + drivers/staging/comedi/drivers/das800.c | 11 +- + drivers/staging/comedi/drivers/dmm32at.c | 5 +- + drivers/staging/comedi/drivers/dt2814.c | 2 +- + drivers/staging/comedi/drivers/dt282x.c | 61 +- + drivers/staging/comedi/drivers/dt3000.c | 8 +- + drivers/staging/comedi/drivers/dt9812.c | 4 +- + drivers/staging/comedi/drivers/dyna_pci10xx.c | 4 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 8 +- + drivers/staging/comedi/drivers/icp_multi.c | 8 +- + drivers/staging/comedi/drivers/me4000.c | 117 +- + drivers/staging/comedi/drivers/me_daq.c | 4 +- + drivers/staging/comedi/drivers/mite.c | 9 +- + drivers/staging/comedi/drivers/ni_6527.c | 8 +- + drivers/staging/comedi/drivers/ni_65xx.c | 9 +- + drivers/staging/comedi/drivers/ni_660x.c | 2 +- + drivers/staging/comedi/drivers/ni_at_a2150.c | 21 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 7 +- + drivers/staging/comedi/drivers/ni_labpc_common.c | 8 +- + drivers/staging/comedi/drivers/ni_labpc_isadma.c | 7 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 163 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 14 +- + drivers/staging/comedi/drivers/ni_stc.h | 2 +- + drivers/staging/comedi/drivers/ni_tiocmd.c | 6 +- + drivers/staging/comedi/drivers/ni_usb6501.c | 2 +- + drivers/staging/comedi/drivers/pcl711.c | 12 +- + drivers/staging/comedi/drivers/pcl726.c | 5 +- + drivers/staging/comedi/drivers/pcl812.c | 32 +- + drivers/staging/comedi/drivers/pcl816.c | 19 +- + drivers/staging/comedi/drivers/pcl818.c | 18 +- + drivers/staging/comedi/drivers/pcmmio.c | 21 +- + drivers/staging/comedi/drivers/pcmuio.c | 22 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 10 +- + drivers/staging/comedi/drivers/rtd520.c | 76 +- + drivers/staging/comedi/drivers/s626.c | 21 +- + drivers/staging/comedi/drivers/serial2002.c | 4 +- + drivers/staging/comedi/drivers/usbdux.c | 367 +- + drivers/staging/comedi/drivers/usbduxfast.c | 142 +- + drivers/staging/comedi/drivers/usbduxsigma.c | 316 +- + drivers/staging/comedi/drivers/vmk80xx.c | 8 +- + drivers/staging/comedi/range.c | 36 +- + drivers/staging/cptm1217/clearpad_tm1217.c | 2 +- + drivers/staging/dgap/dgap.c | 10517 +++++++++---------- + drivers/staging/dgnc/dgnc_cls.c | 30 +- + drivers/staging/dgnc/dgnc_driver.c | 33 +- + drivers/staging/dgnc/dgnc_driver.h | 61 +- + drivers/staging/dgnc/dgnc_kcompat.h | 18 - + drivers/staging/dgnc/dgnc_neo.c | 30 +- + drivers/staging/dgnc/dgnc_sysfs.c | 37 - + drivers/staging/dgnc/dgnc_tty.c | 146 +- + drivers/staging/dgnc/dgnc_tty.h | 2 - + drivers/staging/emxx_udc/emxx_udc.c | 7 +- + drivers/staging/ft1000/ft1000-pcmcia/boot.h | 34 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 30 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 50 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 208 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 934 +- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 1204 ++- + .../staging/ft1000/ft1000-usb/ft1000_download.c | 400 +- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 436 +- + drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 60 +- + drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 97 +- + drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 4 +- + drivers/staging/gdm724x/gdm_lte.c | 10 +- + drivers/staging/gdm724x/gdm_mux.h | 8 +- + drivers/staging/gdm72xx/gdm_wimax.c | 6 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 57 +- + drivers/staging/iio/Documentation/generic_buffer.c | 81 +- + .../staging/iio/Documentation/iio_event_monitor.c | 32 +- + drivers/staging/iio/Documentation/iio_utils.h | 7 + + drivers/staging/iio/Documentation/lsiio.c | 20 +- + drivers/staging/iio/accel/Kconfig | 39 +- + drivers/staging/iio/accel/lis3l02dq_ring.c | 1 + + drivers/staging/iio/adc/ad7192.c | 3 +- + drivers/staging/iio/adc/ad7280a.c | 2 +- + drivers/staging/iio/adc/ad7606_spi.c | 2 +- + drivers/staging/iio/adc/ad7816.c | 3 +- + drivers/staging/iio/adc/lpc32xx_adc.c | 2 +- + drivers/staging/iio/adc/mxs-lradc.c | 6 +- + drivers/staging/iio/adc/spear_adc.c | 4 +- + drivers/staging/iio/addac/Kconfig | 9 + + drivers/staging/iio/addac/adt7316.h | 3 +- + drivers/staging/iio/gyro/Kconfig | 5 +- + drivers/staging/iio/light/tsl2x7x_core.c | 17 +- + drivers/staging/iio/meter/Kconfig | 15 + + drivers/staging/iio/trigger/Kconfig | 5 +- + .../staging/iio/trigger/iio-trig-periodic-rtc.c | 3 +- + drivers/staging/imx-drm/Kconfig | 7 +- + drivers/staging/imx-drm/imx-drm-core.c | 5 +- + drivers/staging/imx-drm/imx-tve.c | 3 +- + drivers/staging/imx-drm/ipuv3-plane.c | 43 +- + drivers/staging/imx-drm/ipuv3-plane.h | 2 + + drivers/staging/imx-drm/parallel-display.c | 8 + + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 5 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 11 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 15 +- + drivers/staging/lustre/lnet/lnet/lib-md.c | 2 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 16 +- + drivers/staging/lustre/lnet/lnet/lo.c | 8 +- + drivers/staging/lustre/lnet/lnet/module.c | 10 +- + drivers/staging/lustre/lnet/lnet/router_proc.c | 16 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 8 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 34 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 20 +- + drivers/staging/lustre/lnet/selftest/framework.c | 50 +- + drivers/staging/lustre/lnet/selftest/module.c | 15 +- + drivers/staging/lustre/lnet/selftest/ping_test.c | 2 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 34 +- + drivers/staging/lustre/lnet/selftest/timer.c | 8 +- + drivers/staging/lustre/lustre/include/dt_object.h | 4 +- + .../lustre/lustre/include/linux/lustre_compat25.h | 8 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 8 +- + drivers/staging/lustre/lustre/include/lu_object.h | 4 +- + .../staging/lustre/lustre/include/lustre_capa.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 +- + .../staging/lustre/lustre/include/lustre_eacl.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_lib.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 7 +- + drivers/staging/lustre/lustre/include/obd_class.h | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 5 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 8 +- + drivers/staging/lustre/lustre/libcfs/debug.c | 2 +- + drivers/staging/lustre/lustre/libcfs/fail.c | 24 +- + drivers/staging/lustre/lustre/libcfs/hash.c | 25 +- + drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 2 +- + .../lustre/lustre/libcfs/linux/linux-proc.c | 2 +- + drivers/staging/lustre/lustre/llite/dir.c | 71 +- + drivers/staging/lustre/lustre/llite/file.c | 9 +- + .../staging/lustre/lustre/llite/llite_internal.h | 18 - + drivers/staging/lustre/lustre/llite/llite_lib.c | 56 +- + drivers/staging/lustre/lustre/llite/lloop.c | 4 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 60 +- + drivers/staging/lustre/lustre/llite/namei.c | 2 +- + drivers/staging/lustre/lustre/llite/rw.c | 2 +- + drivers/staging/lustre/lustre/llite/rw26.c | 6 +- + drivers/staging/lustre/lustre/llite/statahead.c | 2 +- + drivers/staging/lustre/lustre/llite/super25.c | 2 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 2 +- + drivers/staging/lustre/lustre/llite/xattr.c | 3 + + drivers/staging/lustre/lustre/llite/xattr_cache.c | 5 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 3 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 3 +- + drivers/staging/lustre/lustre/lov/lov_pack.c | 3 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 8 +- + drivers/staging/lustre/lustre/obdclass/acl.c | 8 +- + drivers/staging/lustre/lustre/obdclass/capa.c | 6 +- + drivers/staging/lustre/lustre/obdclass/debug.c | 12 +- + drivers/staging/lustre/lustre/obdclass/dt_object.c | 15 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 10 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 4 +- + drivers/staging/lustre/lustre/obdclass/llog_obd.c | 2 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 4 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 2 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 137 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 4 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 2 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 11 - + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 5 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 26 - + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 5 +- + drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 18 - + drivers/staging/media/cxd2099/cxd2099.c | 2 +- + drivers/staging/media/davinci_vpfe/dm365_ipipe.h | 4 +- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 62 +- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.h | 58 +- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 4 +- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.h | 2 +- + drivers/staging/media/davinci_vpfe/dm365_isif.c | 11 +- + drivers/staging/media/davinci_vpfe/dm365_isif.h | 6 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 8 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.h | 2 +- + drivers/staging/media/lirc/lirc_bt829.c | 14 +- + drivers/staging/media/lirc/lirc_imon.c | 30 +- + drivers/staging/media/lirc/lirc_sasem.c | 5 +- + drivers/staging/media/lirc/lirc_sir.c | 18 +- + drivers/staging/media/lirc/lirc_zilog.c | 137 +- + drivers/staging/media/omap24xx/omap24xxcam.c | 6 +- + drivers/staging/media/omap24xx/tcm825x.c | 2 +- + drivers/staging/media/omap4iss/iss.c | 4 +- + drivers/staging/media/omap4iss/iss_csi2.c | 2 +- + drivers/staging/octeon-usb/octeon-hcd.c | 37 +- + drivers/staging/octeon/ethernet-rx.c | 2 + + drivers/staging/octeon/ethernet-tx.c | 11 + + drivers/staging/octeon/ethernet.c | 2 +- + drivers/staging/ozwpan/ozhcd.c | 16 +- + drivers/staging/ozwpan/ozusbsvc1.c | 12 +- + drivers/staging/panel/TODO | 1 - + drivers/staging/panel/panel.c | 12 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 17 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 9 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 14 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 47 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 16 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 1 - + drivers/staging/rtl8188eu/core/rtw_led.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 10 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 28 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 7 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 14 +- + drivers/staging/rtl8188eu/core/rtw_security.c | 24 +- + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 1 - + drivers/staging/rtl8188eu/core/rtw_xmit.c | 10 +- + drivers/staging/rtl8188eu/hal/bb_cfg.c | 4 +- + drivers/staging/rtl8188eu/hal/fw.c | 8 +- + drivers/staging/rtl8188eu/hal/mac_cfg.c | 2 +- + drivers/staging/rtl8188eu/hal/odm.c | 8 +- + drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 2 +- + drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 2 +- + drivers/staging/rtl8188eu/hal/phy.c | 2 +- + drivers/staging/rtl8188eu/hal/rf.c | 2 +- + drivers/staging/rtl8188eu/hal/rf_cfg.c | 4 +- + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 6 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 2 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 4 +- + drivers/staging/rtl8188eu/include/ieee80211_ext.h | 20 +- + drivers/staging/rtl8188eu/include/odm_debug.h | 31 +- + drivers/staging/rtl8188eu/include/osdep_service.h | 4 +- + drivers/staging/rtl8188eu/include/rtw_debug.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_led.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 26 +- + drivers/staging/rtl8188eu/include/wifi.h | 36 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 27 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 2 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 2 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 41 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 - + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 8 +- + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 8 - + drivers/staging/rtl8192e/rtl819x_BAProc.c | 23 +- + drivers/staging/rtl8192e/rtllib.h | 6 +- + drivers/staging/rtl8192e/rtllib_rx.c | 4 - + drivers/staging/rtl8192e/rtllib_softmac.c | 11 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 22 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 26 +- + .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 3 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 2 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 20 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 11 +- + drivers/staging/rtl8192u/r8192U_core.c | 22 +- + drivers/staging/rtl8192u/r8192U_dm.c | 91 - + drivers/staging/rtl8192u/r8192U_wx.c | 6 - + drivers/staging/rtl8192u/r819xU_firmware.c | 20 +- + drivers/staging/rtl8192u/r819xU_firmware.h | 8 +- + drivers/staging/rtl8192u/r819xU_phy.c | 1 + + drivers/staging/rtl8712/hal_init.c | 11 +- + drivers/staging/rtl8712/ieee80211.c | 17 +- + drivers/staging/rtl8712/osdep_service.h | 8 +- + drivers/staging/rtl8712/recv_linux.c | 2 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 13 +- + drivers/staging/rtl8712/rtl8712_efuse.c | 43 +- + drivers/staging/rtl8712/rtl8712_recv.c | 15 +- + drivers/staging/rtl8712/rtl871x_cmd.c | 58 +- + drivers/staging/rtl8712/rtl871x_io.c | 6 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 23 +- + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 24 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 27 +- + drivers/staging/rtl8712/rtl871x_mp.c | 4 +- + drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 3 - + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 4 +- + drivers/staging/rtl8712/rtl871x_recv.c | 19 +- + drivers/staging/rtl8712/rtl871x_recv.h | 3 - + drivers/staging/rtl8712/rtl871x_security.c | 10 +- + drivers/staging/rtl8712/rtl871x_sta_mgt.c | 11 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 15 +- + drivers/staging/rtl8712/usb_intf.c | 16 +- + drivers/staging/rtl8712/usb_ops_linux.c | 9 +- + drivers/staging/rtl8712/xmit_linux.c | 4 +- + drivers/staging/rtl8723au/core/rtw_ap.c | 159 +- + drivers/staging/rtl8723au/core/rtw_cmd.c | 131 +- + drivers/staging/rtl8723au/core/rtw_efuse.c | 23 +- + drivers/staging/rtl8723au/core/rtw_ieee80211.c | 4 +- + drivers/staging/rtl8723au/core/rtw_led.c | 84 +- + drivers/staging/rtl8723au/core/rtw_mlme.c | 63 +- + drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 67 +- + drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 8 +- + drivers/staging/rtl8723au/core/rtw_recv.c | 20 +- + drivers/staging/rtl8723au/core/rtw_security.c | 98 +- + drivers/staging/rtl8723au/core/rtw_sreset.c | 2 +- + drivers/staging/rtl8723au/core/rtw_wlan_util.c | 15 +- + drivers/staging/rtl8723au/core/rtw_xmit.c | 12 +- + .../staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c | 2 +- + drivers/staging/rtl8723au/hal/hal_com.c | 4 +- + .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 36 +- + drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 7 +- + drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 18 +- + drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 3 +- + drivers/staging/rtl8723au/hal/usb_halinit.c | 3 +- + .../staging/rtl8723au/include/Hal8723UHWImg_CE.h | 2 +- + drivers/staging/rtl8723au/include/odm_debug.h | 30 +- + drivers/staging/rtl8723au/include/rtl8723a_dm.h | 3 +- + drivers/staging/rtl8723au/include/rtl8723a_recv.h | 3 +- + drivers/staging/rtl8723au/include/rtw_cmd.h | 3 +- + drivers/staging/rtl8723au/include/rtw_ht.h | 3 +- + drivers/staging/rtl8723au/include/rtw_mlme.h | 2 +- + drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 6 +- + drivers/staging/rtl8723au/include/rtw_xmit.h | 13 +- + drivers/staging/rtl8723au/include/wlan_bssdef.h | 21 +- + drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 20 +- + drivers/staging/rtl8723au/os_dep/os_intfs.c | 8 +- + drivers/staging/rtl8723au/os_dep/usb_intf.c | 27 +- + drivers/staging/rtl8723au/os_dep/usb_ops_linux.c | 23 - + drivers/staging/rts5208/ms.c | 4 +- + drivers/staging/rts5208/rtsx.c | 4 +- + drivers/staging/rts5208/rtsx_chip.c | 459 +- + drivers/staging/rts5208/rtsx_scsi.c | 3 +- + drivers/staging/rts5208/rtsx_transport.c | 8 +- + drivers/staging/rts5208/rtsx_transport.h | 2 +- + drivers/staging/skein/Kconfig | 24 +- + drivers/staging/skein/Makefile | 13 +- + drivers/staging/skein/skein_api.c | 2 +- + drivers/staging/skein/skein_api.h | 2 +- + drivers/staging/skein/{skein.c => skein_base.c} | 23 +- + drivers/staging/skein/{skein.h => skein_base.h} | 39 +- + drivers/staging/skein/skein_block.c | 932 +- + drivers/staging/skein/skein_block.h | 2 +- + drivers/staging/skein/skein_generic.c | 216 + + drivers/staging/skein/skein_iv.h | 2 +- + drivers/staging/skein/threefish_api.h | 2 +- + drivers/staging/slicoss/slicoss.c | 7 +- + drivers/staging/speakup/kobjects.c | 6 +- + drivers/staging/speakup/main.c | 2 +- + drivers/staging/speakup/speakup_dtlk.c | 2 +- + drivers/staging/speakup/speakup_keypc.c | 2 +- + drivers/staging/unisys/channels/channel.c | 114 +- + drivers/staging/unisys/channels/chanstub.c | 8 +- + drivers/staging/unisys/channels/chanstub.h | 8 +- + .../unisys/common-spar/include/channels/channel.h | 505 +- + .../common-spar/include/channels/channel_guid.h | 27 +- + .../include/channels/controlframework.h | 43 +- + .../include/channels/controlvmchannel.h | 623 +- + .../common-spar/include/channels/diagchannel.h | 168 +- + .../common-spar/include/channels/iochannel.h | 292 +- + .../common-spar/include/channels/vbuschannel.h | 80 +- + .../unisys/common-spar/include/vbusdeviceinfo.h | 37 +- + .../unisys/common-spar/include/vmcallinterface.h | 47 +- + drivers/staging/unisys/include/timskmod.h | 16 +- + drivers/staging/unisys/include/uisqueue.h | 75 +- + drivers/staging/unisys/include/uisutils.h | 162 +- + drivers/staging/unisys/include/vbushelper.h | 16 +- + drivers/staging/unisys/uislib/uislib.c | 489 +- + drivers/staging/unisys/uislib/uisqueue.c | 8 +- + drivers/staging/unisys/uislib/uisutils.c | 107 +- + drivers/staging/unisys/virthba/virthba.c | 102 +- + drivers/staging/unisys/virtpci/virtpci.c | 284 +- + drivers/staging/unisys/virtpci/virtpci.h | 20 +- + .../unisys/visorchannel/visorchannel_funcs.c | 218 +- + drivers/staging/unisys/visorchipset/file.c | 6 +- + drivers/staging/unisys/visorchipset/parser.c | 50 +- + drivers/staging/unisys/visorchipset/testing.h | 5 +- + drivers/staging/unisys/visorchipset/visorchipset.h | 275 +- + .../unisys/visorchipset/visorchipset_main.c | 702 +- + drivers/staging/unisys/visorutil/easyproc.c | 6 +- + drivers/staging/unisys/visorutil/procobjecttree.c | 15 +- + drivers/staging/unisys/visorutil/visorkmodutils.c | 10 - + drivers/staging/vme/devices/Kconfig | 3 + + drivers/staging/vme/devices/vme_pio2_gpio.c | 4 +- + drivers/staging/vt6655/80211hdr.h | 318 - + drivers/staging/vt6655/80211mgr.c | 1019 -- + drivers/staging/vt6655/80211mgr.h | 725 -- + drivers/staging/vt6655/IEEE11h.c | 141 - + drivers/staging/vt6655/IEEE11h.h | 42 - + drivers/staging/vt6655/Kconfig | 4 +- + drivers/staging/vt6655/Makefile | 23 +- + drivers/staging/vt6655/aes_ccmp.c | 374 - + drivers/staging/vt6655/aes_ccmp.h | 37 - + drivers/staging/vt6655/baseband.c | 49 +- + drivers/staging/vt6655/baseband.h | 6 +- + drivers/staging/vt6655/bssdb.c | 1512 --- + drivers/staging/vt6655/bssdb.h | 326 - + drivers/staging/vt6655/card.c | 1101 +- + drivers/staging/vt6655/card.h | 101 +- + drivers/staging/vt6655/channel.c | 834 +- + drivers/staging/vt6655/channel.h | 22 +- + drivers/staging/vt6655/country.h | 161 - + drivers/staging/vt6655/datarate.c | 410 - + drivers/staging/vt6655/datarate.h | 78 - + drivers/staging/vt6655/desc.h | 134 +- + drivers/staging/vt6655/device.h | 424 +- + drivers/staging/vt6655/device_cfg.h | 2 - + drivers/staging/vt6655/device_main.c | 2505 ++--- + drivers/staging/vt6655/dpc.c | 1312 +-- + drivers/staging/vt6655/dpc.h | 10 +- + drivers/staging/vt6655/hostap.c | 765 -- + drivers/staging/vt6655/hostap.h | 58 - + drivers/staging/vt6655/iocmd.h | 408 - + drivers/staging/vt6655/ioctl.c | 658 -- + drivers/staging/vt6655/ioctl.h | 36 - + drivers/staging/vt6655/iowpa.h | 130 - + drivers/staging/vt6655/iwctl.c | 1937 ---- + drivers/staging/vt6655/iwctl.h | 206 - + drivers/staging/vt6655/key.c | 838 +- + drivers/staging/vt6655/key.h | 131 +- + drivers/staging/vt6655/mac.c | 3 +- + drivers/staging/vt6655/mac.h | 1 - + drivers/staging/vt6655/mib.c | 423 - + drivers/staging/vt6655/mib.h | 261 - + drivers/staging/vt6655/michael.c | 148 - + drivers/staging/vt6655/michael.h | 52 - + drivers/staging/vt6655/power.c | 208 +- + drivers/staging/vt6655/power.h | 16 - + drivers/staging/vt6655/rc4.c | 88 - + drivers/staging/vt6655/rc4.h | 47 - + drivers/staging/vt6655/rf.h | 1 - + drivers/staging/vt6655/rxtx.c | 2110 +--- + drivers/staging/vt6655/rxtx.h | 52 +- + drivers/staging/vt6655/srom.c | 1 - + drivers/staging/vt6655/srom.h | 2 - + drivers/staging/vt6655/tcrc.c | 191 - + drivers/staging/vt6655/tcrc.h | 50 - + drivers/staging/vt6655/tether.c | 105 - + drivers/staging/vt6655/tether.h | 192 - + drivers/staging/vt6655/tkip.c | 268 - + drivers/staging/vt6655/tkip.h | 57 - + drivers/staging/vt6655/tmacro.h | 2 - + drivers/staging/vt6655/ttype.h | 42 - + drivers/staging/vt6655/upc.h | 1 - + drivers/staging/vt6655/vntconfiguration.dat | 1 - + drivers/staging/vt6655/vntwifi.c | 700 -- + drivers/staging/vt6655/vntwifi.h | 273 - + drivers/staging/vt6655/wcmd.c | 1023 -- + drivers/staging/vt6655/wcmd.h | 123 - + drivers/staging/vt6655/wctl.c | 233 - + drivers/staging/vt6655/wctl.h | 105 - + drivers/staging/vt6655/wmgr.c | 4602 -------- + drivers/staging/vt6655/wmgr.h | 420 - + drivers/staging/vt6655/wpa.c | 300 - + drivers/staging/vt6655/wpa.h | 83 - + drivers/staging/vt6655/wpa2.c | 359 - + drivers/staging/vt6655/wpa2.h | 77 - + drivers/staging/vt6655/wpactl.c | 896 -- + drivers/staging/vt6655/wpactl.h | 64 - + drivers/staging/vt6655/wroute.c | 187 - + drivers/staging/vt6655/wroute.h | 45 - + drivers/staging/vt6656/main_usb.c | 10 +- + drivers/staging/wlan-ng/hfa384x.h | 3 + + drivers/staging/wlan-ng/hfa384x_usb.c | 6 +- + drivers/staging/wlan-ng/p80211conv.c | 2 +- + drivers/staging/wlan-ng/p80211hdr.h | 2 +- + drivers/staging/wlan-ng/p80211netdev.c | 4 +- + drivers/staging/wlan-ng/prism2fw.c | 6 +- + drivers/staging/xgifb/XGI_main_26.c | 2 +- + drivers/staging/xgifb/vb_def.h | 1 - + drivers/staging/xgifb/vb_setmode.c | 2 +- + drivers/staging/xgifb/vb_util.c | 5 +- + include/linux/iio/common/st_sensors.h | 10 +- + include/linux/iio/iio.h | 8 + + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/android/Kbuild | 2 + + .../uapi => include/uapi/linux/android}/binder.h | 1 + + 631 files changed, 17190 insertions(+), 72658 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-iadc.txt + create mode 100644 drivers/android/Kconfig + create mode 100644 drivers/android/Makefile + rename drivers/{staging => }/android/binder.c (99%) + rename drivers/{staging => }/android/binder_trace.h (100%) + create mode 100644 drivers/iio/adc/qcom-spmi-iadc.c + create mode 100644 drivers/iio/humidity/si7020.c + create mode 100644 drivers/iio/pressure/bmp280.c + delete mode 100644 drivers/staging/android/binder.h + delete mode 100644 drivers/staging/bcm/Adapter.h + delete mode 100644 drivers/staging/bcm/Bcmchar.c + delete mode 100644 drivers/staging/bcm/Bcmnet.c + delete mode 100644 drivers/staging/bcm/CmHost.c + delete mode 100644 drivers/staging/bcm/CmHost.h + delete mode 100644 drivers/staging/bcm/DDRInit.c + delete mode 100644 drivers/staging/bcm/DDRInit.h + delete mode 100644 drivers/staging/bcm/Debug.h + delete mode 100644 drivers/staging/bcm/HandleControlPacket.c + delete mode 100644 drivers/staging/bcm/HostMIBSInterface.h + delete mode 100644 drivers/staging/bcm/IPv6Protocol.c + delete mode 100644 drivers/staging/bcm/IPv6ProtocolHdr.h + delete mode 100644 drivers/staging/bcm/InterfaceAdapter.h + delete mode 100644 drivers/staging/bcm/InterfaceDld.c + delete mode 100644 drivers/staging/bcm/InterfaceIdleMode.c + delete mode 100644 drivers/staging/bcm/InterfaceIdleMode.h + delete mode 100644 drivers/staging/bcm/InterfaceInit.c + delete mode 100644 drivers/staging/bcm/InterfaceInit.h + delete mode 100644 drivers/staging/bcm/InterfaceIsr.c + delete mode 100644 drivers/staging/bcm/InterfaceIsr.h + delete mode 100644 drivers/staging/bcm/InterfaceMacros.h + delete mode 100644 drivers/staging/bcm/InterfaceMisc.c + delete mode 100644 drivers/staging/bcm/InterfaceMisc.h + delete mode 100644 drivers/staging/bcm/InterfaceRx.c + delete mode 100644 drivers/staging/bcm/InterfaceRx.h + delete mode 100644 drivers/staging/bcm/InterfaceTx.c + delete mode 100644 drivers/staging/bcm/InterfaceTx.h + delete mode 100644 drivers/staging/bcm/Ioctl.h + delete mode 100644 drivers/staging/bcm/Kconfig + delete mode 100644 drivers/staging/bcm/LeakyBucket.c + delete mode 100644 drivers/staging/bcm/Macros.h + delete mode 100644 drivers/staging/bcm/Makefile + delete mode 100644 drivers/staging/bcm/Misc.c + delete mode 100644 drivers/staging/bcm/PHSDefines.h + delete mode 100644 drivers/staging/bcm/PHSModule.c + delete mode 100644 drivers/staging/bcm/PHSModule.h + delete mode 100644 drivers/staging/bcm/Protocol.h + delete mode 100644 drivers/staging/bcm/Prototypes.h + delete mode 100644 drivers/staging/bcm/Qos.c + delete mode 100644 drivers/staging/bcm/Queue.h + delete mode 100644 drivers/staging/bcm/TODO + delete mode 100644 drivers/staging/bcm/Transmit.c + delete mode 100644 drivers/staging/bcm/Typedefs.h + delete mode 100644 drivers/staging/bcm/cntrl_SignalingInterface.h + delete mode 100644 drivers/staging/bcm/headers.h + delete mode 100644 drivers/staging/bcm/hostmibs.c + delete mode 100644 drivers/staging/bcm/led_control.c + delete mode 100644 drivers/staging/bcm/led_control.h + delete mode 100644 drivers/staging/bcm/nvm.c + delete mode 100644 drivers/staging/bcm/nvm.h + delete mode 100644 drivers/staging/bcm/sort.c + delete mode 100644 drivers/staging/bcm/target_params.h + delete mode 100644 drivers/staging/bcm/vendorspecificextn.c + delete mode 100644 drivers/staging/bcm/vendorspecificextn.h + create mode 100644 drivers/staging/clocking-wizard/Kconfig + create mode 100644 drivers/staging/clocking-wizard/Makefile + create mode 100644 drivers/staging/clocking-wizard/TODO + create mode 100644 drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c + create mode 100644 drivers/staging/clocking-wizard/dt-binding.txt + delete mode 100644 drivers/staging/comedi/drivers/addi-data/addi_common.c + delete mode 100644 drivers/staging/comedi/drivers/addi-data/addi_common.h + delete mode 100644 drivers/staging/comedi/drivers/addi-data/addi_eeprom.c + delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c + delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c + delete mode 100644 drivers/staging/comedi/drivers/addi_apci_035.c + delete mode 100644 drivers/staging/comedi/drivers/addi_apci_3200.c + rename drivers/staging/skein/{skein.c => skein_base.c} (97%) + rename drivers/staging/skein/{skein.h => skein_base.h} (92%) + create mode 100644 drivers/staging/skein/skein_generic.c + delete mode 100644 drivers/staging/vt6655/80211hdr.h + delete mode 100644 drivers/staging/vt6655/80211mgr.c + delete mode 100644 drivers/staging/vt6655/80211mgr.h + delete mode 100644 drivers/staging/vt6655/IEEE11h.c + delete mode 100644 drivers/staging/vt6655/IEEE11h.h + delete mode 100644 drivers/staging/vt6655/aes_ccmp.c + delete mode 100644 drivers/staging/vt6655/aes_ccmp.h + delete mode 100644 drivers/staging/vt6655/bssdb.c + delete mode 100644 drivers/staging/vt6655/bssdb.h + delete mode 100644 drivers/staging/vt6655/country.h + delete mode 100644 drivers/staging/vt6655/datarate.c + delete mode 100644 drivers/staging/vt6655/datarate.h + delete mode 100644 drivers/staging/vt6655/hostap.c + delete mode 100644 drivers/staging/vt6655/hostap.h + delete mode 100644 drivers/staging/vt6655/iocmd.h + delete mode 100644 drivers/staging/vt6655/ioctl.c + delete mode 100644 drivers/staging/vt6655/ioctl.h + delete mode 100644 drivers/staging/vt6655/iowpa.h + delete mode 100644 drivers/staging/vt6655/iwctl.c + delete mode 100644 drivers/staging/vt6655/iwctl.h + delete mode 100644 drivers/staging/vt6655/michael.c + delete mode 100644 drivers/staging/vt6655/michael.h + delete mode 100644 drivers/staging/vt6655/rc4.c + delete mode 100644 drivers/staging/vt6655/rc4.h + delete mode 100644 drivers/staging/vt6655/tcrc.c + delete mode 100644 drivers/staging/vt6655/tcrc.h + delete mode 100644 drivers/staging/vt6655/tether.c + delete mode 100644 drivers/staging/vt6655/tether.h + delete mode 100644 drivers/staging/vt6655/tkip.c + delete mode 100644 drivers/staging/vt6655/tkip.h + delete mode 100644 drivers/staging/vt6655/ttype.h + delete mode 100644 drivers/staging/vt6655/vntconfiguration.dat + delete mode 100644 drivers/staging/vt6655/vntwifi.c + delete mode 100644 drivers/staging/vt6655/vntwifi.h + delete mode 100644 drivers/staging/vt6655/wcmd.c + delete mode 100644 drivers/staging/vt6655/wcmd.h + delete mode 100644 drivers/staging/vt6655/wctl.c + delete mode 100644 drivers/staging/vt6655/wctl.h + delete mode 100644 drivers/staging/vt6655/wmgr.c + delete mode 100644 drivers/staging/vt6655/wmgr.h + delete mode 100644 drivers/staging/vt6655/wpa.c + delete mode 100644 drivers/staging/vt6655/wpa.h + delete mode 100644 drivers/staging/vt6655/wpa2.c + delete mode 100644 drivers/staging/vt6655/wpa2.h + delete mode 100644 drivers/staging/vt6655/wpactl.c + delete mode 100644 drivers/staging/vt6655/wpactl.h + delete mode 100644 drivers/staging/vt6655/wroute.c + delete mode 100644 drivers/staging/vt6655/wroute.h + create mode 100644 include/uapi/linux/android/Kbuild + rename {drivers/staging/android/uapi => include/uapi/linux/android}/binder.h (99%) +Merging char-misc/char-misc-next (d512c2098b1a mei: hbm: use client specific print functions) +$ git merge char-misc/char-misc-next +Merge made by the 'recursive' strategy. + drivers/misc/mei/amthif.c | 34 +++++++++++++++------------------- + drivers/misc/mei/client.c | 2 +- + drivers/misc/mei/debugfs.c | 8 ++------ + drivers/misc/mei/hbm.c | 21 ++++++++------------- + drivers/misc/mei/interrupt.c | 12 +----------- + drivers/misc/mei/wd.c | 9 ++++++--- + 6 files changed, 33 insertions(+), 53 deletions(-) +Merging cgroup/for-next (cea74465e27b cpuset: lock vs unlock typo) +$ git merge cgroup/for-next +Auto-merging kernel/cpuset.c +Merge made by the 'recursive' strategy. + include/linux/cpuset.h | 37 +++-------- + kernel/cpuset.c | 162 +++++++++++++++++-------------------------------- + mm/hugetlb.c | 2 +- + mm/oom_kill.c | 2 +- + mm/page_alloc.c | 6 +- + mm/slab.c | 2 +- + mm/slub.c | 3 +- + mm/vmscan.c | 5 +- + 8 files changed, 75 insertions(+), 144 deletions(-) +Merging scsi/for-next (6a5411d8719c IB/srp: Separate target and channel variables) +$ git merge scsi/for-next +Auto-merging include/scsi/scsi_host.h +Auto-merging include/linux/blk-mq.h +Auto-merging drivers/usb/storage/debug.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/aha152x.c +Auto-merging block/blk-mq.c +Merge made by the 'recursive' strategy. + Documentation/scsi/st.txt | 8 +- + block/blk-mq-tag.c | 28 + + block/blk-mq.c | 2 + + drivers/infiniband/ulp/srp/ib_srp.c | 778 +++++++++++++++------------- + drivers/infiniband/ulp/srp/ib_srp.h | 69 ++- + drivers/misc/enclosure.c | 44 +- + drivers/scsi/53c700.c | 13 +- + drivers/scsi/NCR5380.c | 17 +- + drivers/scsi/aha152x.c | 992 ++++++++---------------------------- + drivers/scsi/aha1740.c | 2 +- + drivers/scsi/arm/acornscsi.c | 12 +- + drivers/scsi/arm/fas216.c | 39 +- + drivers/scsi/atari_NCR5380.c | 5 +- + drivers/scsi/ch.c | 29 +- + drivers/scsi/constants.c | 588 +++++++++------------ + drivers/scsi/esas2r/esas2r_main.c | 2 +- + drivers/scsi/hosts.c | 4 +- + drivers/scsi/ipr.c | 198 +++++-- + drivers/scsi/ipr.h | 3 +- + drivers/scsi/megaraid.c | 8 +- + drivers/scsi/osst.c | 8 +- + drivers/scsi/ps3rom.c | 4 - + drivers/scsi/qla2xxx/qla_gbl.h | 2 - + drivers/scsi/qla2xxx/qla_nx2.c | 2 +- + drivers/scsi/scsi.c | 45 +- + drivers/scsi/scsi_debug.c | 2 +- + drivers/scsi/scsi_error.c | 131 +++-- + drivers/scsi/scsi_ioctl.c | 22 +- + drivers/scsi/scsi_lib.c | 33 +- + drivers/scsi/scsi_logging.h | 1 + + drivers/scsi/scsi_scan.c | 6 +- + drivers/scsi/scsicam.c | 4 +- + drivers/scsi/sd.c | 60 +-- + drivers/scsi/sd.h | 6 +- + drivers/scsi/sg.c | 23 +- + drivers/scsi/sr.h | 3 +- + drivers/scsi/sr_ioctl.c | 10 +- + drivers/scsi/st.c | 25 +- + drivers/scsi/stex.c | 9 +- + drivers/scsi/storvsc_drv.c | 3 +- + drivers/scsi/sun3_NCR5380.c | 13 +- + drivers/scsi/tmscsim.h | 2 - + drivers/scsi/ufs/ufshcd.c | 8 +- + drivers/scsi/vmw_pvscsi.c | 4 - + drivers/usb/storage/debug.c | 10 +- + drivers/xen/xen-scsiback.c | 4 - + include/linux/blk-mq.h | 17 + + include/scsi/scsi_dbg.h | 28 +- + include/scsi/scsi_device.h | 9 + + include/scsi/scsi_eh.h | 19 +- + include/scsi/scsi_host.h | 8 + + include/scsi/scsi_tcq.h | 19 +- + include/scsi/sg.h | 5 +- + 53 files changed, 1530 insertions(+), 1856 deletions(-) +Merging target-updates/for-next (cac7f2429872 Linux 3.18-rc2) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (3cbfc571a0e5 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/intel/pinctrl-baytrail.c +Auto-merging drivers/gpio/gpiolib-acpi.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/pinctrl-bindings.txt | 2 +- + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 215 +++ + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 162 +++ + .../devicetree/bindings/pinctrl/ste,abx500.txt | 184 +-- + MAINTAINERS | 8 +- + arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi | 64 +- + arch/arm/boot/dts/ste-href-ab8500.dtsi | 162 +-- + arch/arm/boot/dts/ste-href-ab8505.dtsi | 90 +- + arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 230 +-- + arch/arm/boot/dts/ste-href-stuib.dtsi | 4 +- + arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 12 +- + arch/arm/boot/dts/ste-hrefprev60.dtsi | 20 +- + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 42 +- + arch/arm/boot/dts/ste-nomadik-s8815.dts | 8 +- + arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 32 +- + arch/arm/boot/dts/ste-snowball.dts | 36 +- + drivers/gpio/gpiolib-acpi.c | 62 +- + drivers/pinctrl/Kconfig | 13 +- + drivers/pinctrl/Makefile | 2 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 72 + + drivers/pinctrl/freescale/pinctrl-mxs.c | 25 + + drivers/pinctrl/intel/Kconfig | 27 + + drivers/pinctrl/intel/Makefile | 4 + + drivers/pinctrl/{ => intel}/pinctrl-baytrail.c | 7 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 1519 ++++++++++++++++++++ + drivers/pinctrl/nomadik/pinctrl-abx500.c | 33 +- + drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 4 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 18 +- + drivers/pinctrl/pinconf-generic.c | 65 +- + drivers/pinctrl/pinctrl-at91.c | 4 +- + drivers/pinctrl/pinctrl-at91.h | 72 + + drivers/pinctrl/pinctrl-bcm281xx.c | 5 - + drivers/pinctrl/pinctrl-rockchip.c | 116 +- + drivers/pinctrl/pinctrl-st.c | 2 +- + drivers/pinctrl/pinctrl-tb10x.c | 8 +- + drivers/pinctrl/pinctrl-tegra-xusb.c | 19 +- + drivers/pinctrl/qcom/Kconfig | 13 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 933 ++++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 949 ++++++++++++ + drivers/pinctrl/sunxi/Kconfig | 4 + + drivers/pinctrl/sunxi/Makefile | 1 + + drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 749 ++++++++++ + drivers/pinctrl/sunxi/pinctrl-sunxi.h | 1 + + include/dt-bindings/pinctrl/qcom,pmic-gpio.h | 142 ++ + include/dt-bindings/pinctrl/qcom,pmic-mpp.h | 44 + + 46 files changed, 5608 insertions(+), 578 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,pmic-mpp.txt + create mode 100644 drivers/pinctrl/intel/Kconfig + create mode 100644 drivers/pinctrl/intel/Makefile + rename drivers/pinctrl/{ => intel}/pinctrl-baytrail.c (99%) + create mode 100644 drivers/pinctrl/intel/pinctrl-cherryview.c + create mode 100644 drivers/pinctrl/pinctrl-at91.h + create mode 100644 drivers/pinctrl/qcom/pinctrl-spmi-gpio.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-spmi-mpp.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c + create mode 100644 include/dt-bindings/pinctrl/qcom,pmic-gpio.h + create mode 100644 include/dt-bindings/pinctrl/qcom,pmic-mpp.h +Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs) +$ git merge vhost/linux-next +Resolved 'drivers/vhost/net.c' using previous resolution. +Auto-merging drivers/vhost/net.c +CONFLICT (content): Merge conflict in drivers/vhost/net.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 035ad9fb441c] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (2071d0968e56 Documentation: gpio: guidelines for bindings) +$ git merge gpio/for-next +Auto-merging drivers/pinctrl/pinctrl-at91.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpiolib-acpi.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-74xx-mmio.txt | 30 +++ + .../devicetree/bindings/gpio/gpio-vf610.txt | 55 ++++ + Documentation/devicetree/bindings/gpio/gpio.txt | 40 ++- + Documentation/gpio/driver.txt | 4 +- + drivers/gpio/Kconfig | 23 ++ + drivers/gpio/Makefile | 2 + + drivers/gpio/gpio-74xx-mmio.c | 170 ++++++++++++ + drivers/gpio/gpio-amd8111.c | 1 + + drivers/gpio/gpio-bcm-kona.c | 4 +- + drivers/gpio/gpio-cs5535.c | 11 +- + drivers/gpio/gpio-dwapb.c | 4 +- + drivers/gpio/gpio-em.c | 4 +- + drivers/gpio/gpio-grgpio.c | 1 + + drivers/gpio/gpio-mcp23s08.c | 4 +- + drivers/gpio/gpio-omap.c | 2 +- + drivers/gpio/gpio-stp-xway.c | 8 +- + drivers/gpio/gpio-tb10x.c | 7 +- + drivers/gpio/gpio-tegra.c | 4 +- + drivers/gpio/gpio-vf610.c | 295 +++++++++++++++++++++ + drivers/gpio/gpio-vr41xx.c | 4 +- + drivers/gpio/gpiolib-acpi.c | 6 +- + drivers/gpio/gpiolib-sysfs.c | 4 +- + drivers/gpio/gpiolib.c | 16 +- + drivers/pinctrl/pinctrl-at91.c | 4 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 4 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 6 +- + include/linux/gpio.h | 7 +- + include/linux/gpio/driver.h | 4 +- + 28 files changed, 650 insertions(+), 74 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-74xx-mmio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-vf610.txt + create mode 100644 drivers/gpio/gpio-74xx-mmio.c + create mode 100644 drivers/gpio/gpio-vf610.c +Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (e2e08970100d pwm: atmel: Fix calculation of prescale value) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning) +$ git merge dma-buf/for-next +Merge made by the 'recursive' strategy. +Merging userns/for-next (a1998908ba46 nfs: fix kernel warning when removing proc entry) +$ git merge userns/for-next +Resolved 'fs/nfs/client.c' using previous resolution. +Auto-merging fs/nfs/client.c +CONFLICT (content): Merge conflict in fs/nfs/client.c +Auto-merging fs/namespace.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 53365fe23606] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/namespace.c | 9 ++++ + .../selftests/mount/unprivileged-remount-test.c | 51 ++++++++++++---------- + 2 files changed, 36 insertions(+), 24 deletions(-) +Merging ktest/for-next (d832d743385d ktest: Don't bother with bisect good or bad on replay) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (98d147f50eb0 clk: pxa clocks build system fix) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) +$ git merge random/dev +Already up-to-date. +Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +Auto-merging lib/lzo/lzo1x_decompress_safe.c +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging aio/master (668044a5d632 aio: Make it possible to remap aio ring) +$ git merge aio/master +Auto-merging mm/mremap.c +Auto-merging include/linux/fs.h +Auto-merging fs/aio.c +Merge made by the 'recursive' strategy. + fs/aio.c | 25 +++++++++++++++++++++++++ + include/linux/fs.h | 1 + + mm/mremap.c | 3 ++- + 3 files changed, 28 insertions(+), 1 deletion(-) +Merging llvmlinux/for-next (ec25a590c29c arm: LLVMLinux: Use global stack register variable for percpu) +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. + arch/arm/include/asm/percpu.h | 4 ++-- + arch/arm/include/asm/ptrace.h | 5 ++--- + arch/arm/include/asm/thread_info.h | 9 +++++++-- + arch/arm/kernel/return_address.c | 3 +-- + arch/arm/kernel/stacktrace.c | 4 +--- + arch/arm/kernel/unwind.c | 3 +-- + 6 files changed, 14 insertions(+), 14 deletions(-) +Merging documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-utils URL) +$ git merge documentation/for-next +Already up-to-date. +Merging kselftest/next (49296470830a selftests/timers: change test to use ksft framework) +$ git merge kselftest/next +Merge made by the 'recursive' strategy. + .../selftests/breakpoints/breakpoint_test.c | 10 ++-- + tools/testing/selftests/ipc/msgque.c | 26 ++++----- + tools/testing/selftests/kcmp/kcmp_test.c | 27 +++++++--- + tools/testing/selftests/kselftest.h | 62 ++++++++++++++++++++++ + tools/testing/selftests/timers/posix_timers.c | 14 ++--- + 5 files changed, 110 insertions(+), 29 deletions(-) + create mode 100644 tools/testing/selftests/kselftest.h +Merging y2038/y2038 (45446a99cef6 staging: media: lirc: Replace timeval with ktime_t in lirc_parallel.c) +$ git merge y2038/y2038 +Recorded preimage for 'drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c' +Recorded preimage for 'drivers/staging/ft1000/ft1000-usb/ft1000_debug.c' +Recorded preimage for 'drivers/staging/media/lirc/lirc_sasem.c' +Auto-merging kernel/cpuset.c +Auto-merging drivers/staging/media/lirc/lirc_sasem.c +CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c'. +Recorded resolution for 'drivers/staging/ft1000/ft1000-usb/ft1000_debug.c'. +Recorded resolution for 'drivers/staging/media/lirc/lirc_sasem.c'. +[master bbbe72632790] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 6 +-- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 6 +-- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 6 +-- + 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 ++++++++---------------- + kernel/cpuset.c | 12 ++++-- + 10 files changed, 69 insertions(+), 87 deletions(-) +Merging akpm-current/current (f87854f250cb ipc/shm.c: fix overly aggressive shmdt() when calls span multiple segments) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'drivers/usb/storage/debug.c' +Auto-merging security/smack/smack_lsm.c +Auto-merging mm/vmscan.c +Auto-merging mm/truncate.c +Auto-merging mm/slub.c +Auto-merging mm/slab.c +Removing mm/page_cgroup.c +Auto-merging mm/page_alloc.c +Auto-merging mm/oom_kill.c +Auto-merging mm/mremap.c +Auto-merging mm/memory.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Removing kernel/res_counter.c +Auto-merging kernel/gcov/Kconfig +Auto-merging kernel/fork.c +Auto-merging kernel/debug/debug_core.c +Removing ipc/ipcns_notifier.c +Auto-merging init/Kconfig +Auto-merging include/net/sock.h +Auto-merging include/linux/sched.h +Removing include/linux/res_counter.h +Removing include/linux/page_cgroup.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/cgroup.h +Auto-merging fs/open.c +Auto-merging fs/ocfs2/journal.c +Auto-merging fs/ocfs2/dir.c +Auto-merging fs/notify/fsnotify.c +Auto-merging fs/cifs/smb2pdu.h +Auto-merging fs/cifs/smb2pdu.c +Auto-merging fs/cifs/smb2ops.c +Auto-merging fs/cifs/file.c +Auto-merging fs/befs/linuxvfs.c +Auto-merging fs/affs/amigaffs.c +Auto-merging drivers/usb/storage/debug.c +CONFLICT (content): Merge conflict in drivers/usb/storage/debug.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/platforms/cell/spufs/inode.c +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Removing Documentation/cgroups/resource_counter.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/usb/storage/debug.c'. +[master e155b153659a] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/cgroups/hugetlb.txt | 2 +- + Documentation/cgroups/memory.txt | 26 +- + Documentation/cgroups/resource_counter.txt | 197 -- + Documentation/devicetree/bindings/rtc/rtc-omap.txt | 9 +- + Documentation/filesystems/vfat.txt | 10 + + Documentation/kdump/kdump.txt | 7 + + Documentation/kernel-parameters.txt | 3 + + Documentation/leds/leds-class.txt | 3 - + Documentation/printk-formats.txt | 6 + + Documentation/sysctl/kernel.txt | 50 +- + MAINTAINERS | 6 +- + arch/arm/Kconfig | 1 + + arch/arm/boot/dts/am335x-boneblack.dts | 4 + + arch/arm/boot/dts/am33xx.dtsi | 2 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/pgtable.h | 1 + + arch/ia64/kernel/perfmon.c | 2 +- + arch/microblaze/Kconfig | 1 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/pgtable-ppc64.h | 1 + + arch/powerpc/platforms/cell/spufs/inode.c | 4 +- + arch/s390/Kconfig | 1 + + arch/sh/Kconfig | 1 + + arch/sparc/include/asm/pgtable_64.h | 7 + + arch/tile/kernel/early_printk.c | 19 +- + arch/tile/kernel/setup.c | 45 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/pgtable.h | 5 + + block/bio.c | 54 +- + block/genhd.c | 2 +- + drivers/base/Kconfig | 8 +- + drivers/block/zram/zram_drv.c | 78 +- + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 3 + + drivers/input/input.c | 9 + + drivers/input/leds.c | 272 +++ + drivers/leds/Kconfig | 3 - + drivers/misc/ti-st/st_core.c | 2 +- + drivers/rtc/interface.c | 8 + + drivers/rtc/rtc-omap.c | 547 +++-- + drivers/rtc/rtc-pcf8563.c | 55 +- + drivers/tty/Kconfig | 4 + + drivers/tty/vt/keyboard.c | 110 +- + drivers/usb/storage/debug.c | 2 +- + drivers/video/backlight/backlight.c | 2 - + fs/affs/affs.h | 2 + + fs/affs/amigaffs.c | 28 +- + fs/affs/file.c | 72 +- + fs/befs/linuxvfs.c | 4 - + fs/binfmt_misc.c | 393 ++-- + fs/char_dev.c | 1 - + fs/cifs/cifsacl.c | 2 +- + fs/cifs/cifssmb.c | 20 +- + fs/cifs/file.c | 4 +- + fs/cifs/sess.c | 2 +- + fs/cifs/smb2file.c | 4 +- + fs/cifs/smb2misc.c | 38 +- + fs/cifs/smb2ops.c | 2 +- + fs/cifs/smb2pdu.c | 2 +- + fs/cifs/smb2pdu.h | 28 +- + fs/ext4/fsync.c | 5 +- + fs/fat/cache.c | 38 +- + fs/fat/fat.h | 5 + + fs/fat/file.c | 67 + + fs/fat/inode.c | 77 +- + fs/file.c | 2 +- + fs/hfsplus/catalog.c | 89 +- + fs/hfsplus/dir.c | 11 +- + fs/hfsplus/hfsplus_fs.h | 4 +- + fs/hfsplus/super.c | 4 +- + fs/hugetlbfs/inode.c | 14 +- + fs/inode.c | 2 +- + fs/mpage.c | 23 +- + fs/ncpfs/ioctl.c | 1 - + fs/notify/fsnotify.c | 55 +- + fs/ocfs2/alloc.c | 28 +- + fs/ocfs2/alloc.h | 2 +- + fs/ocfs2/aops.c | 273 ++- + fs/ocfs2/cluster/heartbeat.c | 4 +- + fs/ocfs2/cluster/tcp.c | 2 +- + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/dlm/dlmast.c | 6 +- + fs/ocfs2/dlm/dlmmaster.c | 34 +- + fs/ocfs2/dlm/dlmrecovery.c | 18 +- + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/ocfs2/file.c | 114 +- + fs/ocfs2/file.h | 9 + + fs/ocfs2/inode.c | 13 +- + fs/ocfs2/inode.h | 2 + + fs/ocfs2/journal.c | 115 +- + fs/ocfs2/journal.h | 5 + + fs/ocfs2/namei.c | 348 ++++ + fs/ocfs2/namei.h | 5 + + fs/ocfs2/ocfs2.h | 15 + + fs/ocfs2/ocfs2_fs.h | 5 +- + fs/ocfs2/ocfs2_trace.h | 3 + + fs/ocfs2/slot_map.c | 2 +- + fs/ocfs2/super.c | 6 +- + fs/ocfs2/xattr.c | 2 +- + fs/open.c | 11 + + fs/proc/generic.c | 163 +- + fs/proc/internal.h | 11 +- + fs/proc/proc_net.c | 1 + + fs/proc/root.c | 1 + + fs/proc/task_mmu.c | 101 +- + include/linux/bitmap.h | 36 +- + include/linux/cgroup.h | 26 + + include/linux/compaction.h | 10 +- + include/linux/crc64_ecma.h | 56 + + include/linux/fault-inject.h | 17 +- + include/linux/file.h | 1 - + include/linux/fs.h | 23 +- + include/linux/gfp.h | 4 +- + include/linux/hugetlb.h | 3 +- + include/linux/hugetlb_cgroup.h | 1 - + include/linux/input.h | 28 + + include/linux/ipc_namespace.h | 20 - + include/linux/kern_levels.h | 13 + + include/linux/kernel.h | 1 + + include/linux/memcontrol.h | 109 +- + include/linux/mm_types.h | 5 + + include/linux/mmu_notifier.h | 90 +- + include/linux/mmzone.h | 21 +- + include/linux/page-isolation.h | 8 + + include/linux/page_cgroup.h | 105 - + include/linux/page_counter.h | 51 + + include/linux/percpu-refcount.h | 47 +- + include/linux/printk.h | 1 - + include/linux/ratelimit.h | 12 +- + include/linux/res_counter.h | 223 --- + include/linux/sched.h | 7 +- + include/linux/slab.h | 16 +- + include/linux/string.h | 1 + + include/linux/swap_cgroup.h | 42 + + include/net/sock.h | 26 +- + include/uapi/linux/msg.h | 28 +- + include/uapi/linux/sem.h | 18 +- + include/uapi/linux/sysctl.h | 1 + + init/Kconfig | 40 +- + init/main.c | 13 +- + ipc/Makefile | 2 +- + ipc/ipc_sysctl.c | 93 +- + ipc/ipcns_notifier.c | 92 - + ipc/msg.c | 36 +- + ipc/namespace.c | 22 - + ipc/sem.c | 13 +- + ipc/shm.c | 18 +- + ipc/util.c | 40 - + kernel/Makefile | 1 - + kernel/debug/debug_core.c | 9 +- + kernel/debug/kdb/kdb_debugger.c | 4 + + kernel/debug/kdb/kdb_main.c | 4 +- + kernel/events/uprobes.c | 8 +- + kernel/fork.c | 4 +- + kernel/gcov/Kconfig | 5 +- + kernel/kexec.c | 2 +- + kernel/kmod.c | 43 +- + kernel/panic.c | 15 +- + kernel/printk/printk.c | 47 +- + kernel/res_counter.c | 211 -- + kernel/sysctl.c | 15 +- + kernel/sysctl_binary.c | 1 + + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/bitmap.c | 24 +- + lib/crc64_ecma.c | 341 ++++ + lib/decompress.c | 4 +- + lib/decompress_bunzip2.c | 2 +- + lib/dynamic_debug.c | 4 +- + lib/fault-inject.c | 21 +- + lib/vsprintf.c | 20 +- + mm/Makefile | 4 +- + mm/cma.c | 19 +- + mm/compaction.c | 99 +- + mm/debug.c | 5 +- + mm/filemap.c | 10 +- + mm/filemap_xip.c | 23 +- + mm/fremap.c | 2 +- + mm/frontswap.c | 2 +- + mm/huge_memory.c | 10 +- + mm/hugetlb.c | 33 +- + mm/hugetlb_cgroup.c | 103 +- + mm/internal.h | 32 +- + mm/ksm.c | 4 +- + mm/memcontrol.c | 2081 ++++++-------------- + mm/memory-failure.c | 8 +- + mm/memory.c | 19 +- + mm/memory_hotplug.c | 4 +- + mm/migrate.c | 3 +- + mm/mmap.c | 22 +- + mm/mmu_notifier.c | 25 + + mm/mremap.c | 6 +- + mm/nommu.c | 17 +- + mm/oom_kill.c | 4 +- + mm/page-writeback.c | 4 +- + mm/page_alloc.c | 197 +- + mm/page_cgroup.c | 530 ----- + mm/page_counter.c | 192 ++ + mm/page_isolation.c | 45 +- + mm/rmap.c | 18 +- + mm/slab.c | 80 +- + mm/slab.h | 30 +- + mm/slab_common.c | 108 +- + mm/slub.c | 36 +- + mm/swap_cgroup.c | 208 ++ + mm/swap_state.c | 1 - + mm/swapfile.c | 2 +- + mm/truncate.c | 5 +- + mm/util.c | 30 + + mm/vmalloc.c | 3 +- + mm/vmscan.c | 18 +- + mm/zbud.c | 2 +- + mm/zsmalloc.c | 80 +- + net/ipv4/tcp_memcontrol.c | 87 +- + scripts/checkpatch.pl | 113 +- + security/smack/smack_lsm.c | 13 +- + usr/Kconfig | 24 +- + 217 files changed, 5712 insertions(+), 4755 deletions(-) + delete mode 100644 Documentation/cgroups/resource_counter.txt + create mode 100644 drivers/input/leds.c + create mode 100644 include/linux/crc64_ecma.h + delete mode 100644 include/linux/page_cgroup.h + create mode 100644 include/linux/page_counter.h + delete mode 100644 include/linux/res_counter.h + create mode 100644 include/linux/swap_cgroup.h + delete mode 100644 ipc/ipcns_notifier.c + delete mode 100644 kernel/res_counter.c + create mode 100644 lib/crc64_ecma.c + delete mode 100644 mm/page_cgroup.c + create mode 100644 mm/page_counter.c + create mode 100644 mm/swap_cgroup.c +$ git am -3 ../patches/0001-mm-convert-i_mmap_mutex-to-rwsem-fix.patch +Applying: mm: convert i_mmap_mutex to rwsem fix +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/gpio/gpio-zevio.c: fix build +Applying: slab: fix cpuset check in fallback_alloc +Applying: slub: fix cpuset check in get_any_partial +Applying: mm/cma: make kmemleak ignore CMA regions +Applying: mm: cma: split cma-reserved in dmesg log +Applying: fs: proc: include cma info in proc/meminfo +Applying: lib/show_mem.c: adds cma reserved information +Applying: lib-show_mem-this-patch-adds-cma-reserved-infromation-fix +Applying: mm: replace remap_file_pages() syscall with emulation +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 + + a857cedc7249...c6ebbf6333fe akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (c6ebbf6333fe mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Removing mm/fremap.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/vm/remap_file_pages.txt | 7 +- + drivers/gpio/gpio-zevio.c | 4 + + drivers/w1/w1_int.c | 3 +- + fs/proc/meminfo.c | 15 +- + include/linux/cma.h | 1 + + include/linux/fs.h | 8 +- + lib/show_mem.c | 6 + + mm/Makefile | 2 +- + mm/backing-dev.c | 35 ++++ + mm/cma.c | 7 + + mm/fremap.c | 283 ------------------------------ + mm/mmap.c | 69 ++++++++ + mm/nommu.c | 8 - + mm/page_alloc.c | 6 +- + mm/slab.c | 2 +- + mm/slub.c | 3 +- + 17 files changed, 160 insertions(+), 307 deletions(-) + delete mode 100644 mm/fremap.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..82c37e0249a6 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing jdelvare-hwmon based on 3.17 +Unchanged quilt series jdelvare-hwmon diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..c635f212719a --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20141106 |