diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-10 16:51:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-10 16:51:00 +1100 |
| commit | 22f3190416445059ec17332efd71e78ec969d37f (patch) | |
| tree | 77abeef655cf1402da7dba5751d04661074fe0fb | |
| parent | fbe700b432f68228d596254995296194dbc7845d (diff) | |
Add linux-next specific files for 20141010next-20141010
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 228 | ||||
| -rw-r--r-- | Next/Trees | 230 | ||||
| -rw-r--r-- | Next/merge.log | 8306 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 8767 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..c857b30dd0c9 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,228 @@ +Name SHA1 +---- ---- +origin 80213c03c4151d900cf293ef0fc51f8d88495e14 +fixes b94d525e58dc9638dd3f98094cb468bcfb262039 +kbuild-current 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +arc-current 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd +arm-current ad684dce87fac52738649e62b4afa25081b52a28 +m68k-current 24cae7934cf1455c9793a95376a206ca6b965ade +metag-fixes ffe6902b66aaa4ca6694bc19639259c16d84ddb1 +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-merge 396a34340cdf7373c00e3977db27d1a20ea65ebc +powerpc-merge-mpe 7d59deb50aafbdc01b52aed209d202d827261cb0 +sparc 1cef94c36bd4d79b5ae3a3df99ee0d76d6a4a6dc +net ea97caeee2ba60d258292ffca0b2c4778eb6bc21 +ipsec b8c203b2d2fc961bafd53b41d5396bbcdec55998 +sound-current fd1a2a90d08b0052fa52bd36cebd0592c9e537c2 +pci-current 7cbeb9f90db8e56856db7568520b735732d34d86 +wireless f8adaf0ae978252c9f7e29e96aefcd8fcaf806ba +driver-core.current 9e82bf014195d6f0054982c463575cdce24292be +tty.current 9e82bf014195d6f0054982c463575cdce24292be +usb.current 0f33be009b89d2268e94194dc4fd01a7851b6d51 +usb-gadget-fixes 0b93a4c838fa10370d72f86fe712426ac63804de +usb-serial-fixes dee80ad12d2b1b304286a707fde7ab05d1fc7bab +staging.current 80213c03c4151d900cf293ef0fc51f8d88495e14 +char-misc.current 9e82bf014195d6f0054982c463575cdce24292be +input-current 447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6 +md-current d47648fcf0611812286f68131b40251c6fa54f5e +crypto-current be34c4ef693ff5c10f55606dbd656ddf0b4a8340 +ide a53dae49b2fea43d8f4ec5aeca0e288bbc8d6895 +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +devicetree-current e66c98c7a0eacc33a9369a3ec086740044eb986c +rr-fixes f49819560f53b7f3a596a8ea2e6764dc86695b62 +vfio-fixes 239a87020b263fe7e70adc5803cb157955023d3c +kselftest-fixes ce6a144a0d01c6628496e4c0d18fbf3a0362cc67 +drm-intel-fixes bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 +asm-generic f3670394c29ff3730638762c1760fd2f624e6d7b +arc a3556087153d2e0686ae362e5f37d2c2be20dda7 +arm d5d16892243e7755da706d03b34da85ea6a74117 +arm-perf 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +arm-soc e7c773b4dde35804387a9177b38518b20835d2fc +bcm2835 fa389e220254c69ffae0d403eac4146171062d08 +berlin 8d4f3361e05cb9093a26e3fa63b930df1591256f +cortex-m f0d7515372ff0ea53fd66099533d3c8e0464cbbf +ep93xx bfb0709fd17b13498d99592bbe12c91130e35a55 +imx-mxs 2b2244a3e7c3d537f436a3580999b3032628d17d +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +keystone c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +msm 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1 +mvebu 65a3bb88bb33cdddcdb1635708b27d895226502b +renesas cc38f02b87eff1ca129df87b6265aa0ff9220453 +samsung a84aaa7556a5b2b1f041777904275525c065e4c5 +sunxi 429823087fec3d3138c72f2910d36d3d8d0733a7 +tegra 5599b91976479fb87ca3c3ade8a518e56c103b44 +arm64 0a6479b0ffad8dd236915e271faaf2cbb4cac287 +blackfin 275f5a8573e7832d0cf344a1b29da357c7038870 +c6x ae72758f1dd93bd367dc7719702f24a9bfb3bad9 +cris cd065a010a97e3c330d1ded9af551664c9689b19 +hexagon a9a44fdf329668125042055c569656aa83d8cccb +ia64 0f33be009b89d2268e94194dc4fd01a7851b6d51 +m68k 24cae7934cf1455c9793a95376a206ca6b965ade +m68knommu e803d4bd31184b301a54352bb2c1a3fa93f80154 +metag f93125ae17d1d259b5aba84016db260903822194 +microblaze 554336c714f4235eb9386a252989b411e9978b9f +mips 31d6f57d3c65fd75c18ea9a3acebedc6cd60d656 +openrisc 548dafe880ad84d0accc0a5596c26e3348b103e1 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd 7575e4d56f6fdd7fe54fb603615b51d82f066700 +powerpc 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +powernv-cpuidle 0888839c5b62c44a55ac9d28acc273ba663c65ea +powerpc-mpe d53ba6b3bba33432cc37b7101a86f8f3392c46e7 +fsl cb0446c1b625326682ec4f9d1dd10779433646bc +mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +s390 0cccdda8d1512af4d3f6913044e8c8e58e15ef37 +sparc-next 619df5d2870b80696fd32521376560e0a4223e44 +tile 78410af51146796f783925009c8676a30d6c6d90 +uml 989e59fa41c5464ab77bf0bf82f32f721430544e +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa f2589bff1ce8b94cebc044e5dfeac4d4e8701cbc +btrfs a43bb39b5c710e79e921fb76341bacc418cfde78 +ceph c27a3e4d667fdcad3db7b104f75659478e0c68d8 +cifs 4f927ed143fc7cf9ee6982b5a8b7d0dd65689ade +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 35425ea2492175fd39f6116481fe98b2b3ddd4ca +ext3 c53f755d339b5546600c316333140d5fe958941d +ext4 1c8944cbe1b740ab494af3401d6cecb5a75ac68f +f2fs da01e61428aa2b5c424fddc11178498462d8c77f +fscache 1a8ed18fb7db48c916c2ccd484e04bd4dd737834 +fuse d7afaec0b564f0609e116f562983b8e72fc3e9c9 +gfs2 d29c0afe4db72ceb72149c3894a6079674e9751f +jfs bb5e50aaa80564268f950d1b2f764455afbfea82 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs b4b56796fe635484d049960ee06a6d435634ab16 +nfsd 34549ab09e62db9703811c6ed4715f2ffa1fd7fb +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 6d565409503f4e1f74ac30de14e8c91a2b826cd8 +v9fs f15844e0777fec936f87a87f97394f83911dacd3 +ubifs 91401a34038e614076dbfb5c4969a052e72fb296 +xfs bdb119bb6e9d11ee7cd5a28503de060172c3db56 +file-locks 1b2b32dcdb3df28dd103033c73cac2417fa05845 +vfs 24dff96a37a2ca319e75a74d3929b2de22447ca6 +pci f92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1 +hid 3fd9127d236cc19188c36dc26c7a3ab5a1612036 +i2c a4ce47f108a6df129c9f4345c6dda0473cb68da5 +jdelvare-hwmon c7208164e66f63e3ec1759b98087849286410741 +hwmon-staging 3afb57fa721f94206e642f8fda51f5a89dda3dfb +v4l-dvb 8f2f28bac3d1af2ee7b732666006b66c879396f0 +kbuild e9f717fb534c1cfc167cbbc04bcde24699921e3b +kconfig 95edca5c523c4b404dd60baa0a1bea0e4c38fd72 +libata 8ccee3cf7d8e6228be45c6aa8520bc0c4de4a247 +pm 9f1a053296953c69d7f23511db9441290cb89e2c +idle e7c95ff32d0075736cbdd8d38d954fb4ed6ced9b +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal dd634666793e51b43b703161302310326c259d50 +ieee1394 d584a66279949561418c82b12bb4c055e6c25836 +dlm 883854c5457a97190f7b0ee20f03bcd9664fc0c2 +swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8 +slave-dma ade4a2a8e6e40fe18be1f83e5ea2e915692a0028 +net-next 64b1f00a0830e1c53874067273a096b228d83d36 +ipsec-next 689f1c9de2abbd76fda224d12cea5f43568a4335 +wireless-next 1fca350b761631d182c2e8bce530896e66404bc2 +bluetooth 2d6d9249c23553390dcec3d0016649e80e8e4d02 +infiniband 3bdad2d13fa62bcb59ca2506e74ce467ea436586 +mtd b25046b1e5e3f1423434da77ccc859f2f779d1ce +l2-mtd 8b3d58e554453ab858bbb169d93b7321bdc628d4 +crypto be34c4ef693ff5c10f55606dbd656ddf0b4a8340 +drm 1e99cfa8de0f0879091e33cd65fd60418d006ad9 +drm-panel 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +drm-intel 1180e20606fd7c5d76dc5b2a1594fa51ba5a0f31 +drm-tegra 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +sound fd1a2a90d08b0052fa52bd36cebd0592c9e537c2 +sound-asoc 6f39b0dbe64660a78aca5890a97f322d1a85de32 +modules 184c3fc3f52fb75800deb76deffb70907d1f76ea +virtio 7ec62d421bdf29cb31101ae2689f7f3a9906289a +input 2c9a9cfec04f2c6ed7b4e607cd53ca903b2c4642 +input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +block 2d5d786aa56062be152379d5068efed41b0ad814 +device-mapper 010b788c73c90a0effdfb57d1534e84a4e51649e +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh 583f958b8a23343c904ec0790c25c96f5f82d409 +kgdb 662bfa325be19ac98af0bc6b31fe142f09033301 +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md 86143256d2020d06657dc1765d985d92b2a769cb +mfd d86c21fd31114e3ef9fae64be335c76aa22859dc +backlight b6af73b42219aa6b253ef5c0020eff1019485ffc +battery 7881c64716f3a7d60b325ed0ad4d15f49b474a43 +fbdev 718b90ac4c21c81f42b6db062ca0867f3cac7648 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 33ac9dba859b07d40e9ec826057d20c857fdede5 +regulator 2ca781ca61352e570be6c9cacd96b3671096ab23 +security 594081ee7145cc30a3977cb4e218f81213b63dc5 +integrity 1b68bdf9cded82d37e443a20c5ed47bbb084d5dc +selinux 4093a8443941d7021c7f747474a87a56cf666270 +lblnet d8ec26d7f8287f5788a494f56e8814210f0e64be +watchdog 199287dd27ef8187cfe716dca8b78d9e7f8a8abf +iommu 09b5269a1b3d47525d7c25efeb16f5407ef82ea2 +dwmw2-iommu 1860e379875dfe7271c649058aeddffe5afd9d0d +vfio 93899a679fd6b2534b5c297d9316bae039ebcbe1 +osd ce5d36aac26cc395fe3bc45525cdbad3644f01e5 +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial 7bb38d57fd75f03753a5b362916c5bbde8290208 +audit 29075feaf1f55e6b1aa4054b44bc141e8d5eab0b +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree 669a36302641fb8ea34b558dc0e2ce1df6f262be +dt-rh d22e9131187df5c220d435b02e7bf346202c00a8 +mailbox 9f3e3cacb2ffdefe28c7cf490bf543e4dcb2770a +spi a2285b8c75bf7e21895f7c2cf75d6a910914517b +tip acb4f4ad94bfbaca1b364bc424aa7a49d7e030b9 +clockevents 3252a646aa2cf706b2a26433a8bd9cb2e5dce410 +edac d0585cd815faef50ce3d12cbe173438eb4d81eb8 +edac-amd a18c3f16a907b8977ef65fc8dd71ed3f7b751748 +irqchip 3bbccffba8d58fb102a02dd840a6fc70223b3027 +tiny d45461ff03ad6ca6e15c0508d40355868a7390b6 +ftrace 70c738a644787bd01b8a7957759044a10d2f05a4 +rcu 3e28e377204badfc3c4119ff2abda473127ee0ff +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm da01e61428aa2b5c424fddc11178498462d8c77f +kvm-arm 0496daa5cf99741ce8db82686b4c7446a37feabb +kvm-ppc 8d0eff6385640a9e6eed0b0c09113794b2bb74e9 +oprofile 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip 95afae481414cbdb0567bf82d5e5077c3ac9da20 +percpu 0a15cbdaefcd2d44fa4b2933627012e5f2f250b1 +workqueues e09c2c295468476a239d13324ce9042ec4de05eb +drivers-x86 eabde0fa967052df12bdd8e8a72f0af799e1e704 +chrome-platform 5502486a2077e4280c618b82e8a77ed35932956f +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap f5b313a2bcd4c436560c044c726d9ad84a3e4bb3 +hsi a26a42508157bc9fda89e3b1d64e47b9e4b55c30 +leds a4c84e6aafda0ddd8cb004c464cd11e47e211049 +ipmi bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 +driver-core 906d201530f2c52aeb4eee31895c71cdccf1e9a0 +tty 69784fa539efa477f39b5a849c27d5e630e0db27 +usb 4ed9a3d455558406cad83d38764ee659de25851c +usb-gadget 72a65a0d19c16de36e970ca6981732b5e8f7f4c4 +usb-serial f8c0e057b4898055b24b44d03b837a15d8b93b37 +staging 80213c03c4151d900cf293ef0fc51f8d88495e14 +char-misc 480bd3c4ad30558dd26c16e3f8358e36522d9af0 +cgroup 55e8955e6ebafed973a107f5a190acfa1a01768f +scsi 20c5ec4e6d71498bfa929899d5850c18f888fb26 +target-updates 218285965f3f0223e29acb10f966fa990f8a474b +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +writeback f9b0e058cbd04ada76b13afffa7e1df830543c24 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl 9a50aaefc1b896e734bf7faf3d085f71a360ce97 +vhost 970379f59d81edf78a319f9cdc1234730bcbe6b2 +remoteproc 9a3c4145af32125c5ee39c0272662b47307a8323 +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +gpio a092e19b688be88f7329bd05f90cb92ebe1a4f5b +dma-mapping b4bbb107d73bbc0d92c9ae7fd8e69580aa9381e7 +pwm e2e08970100db03bb84fd4a72f9c35bfc18d595a +dma-buf 101e31050bf174e5bcca72bdb9d0bd392aa4f966 +userns a1998908ba46526ac5cbbb9aae610cb234bd9f33 +ktest d832d743385dd5e735660951aa9d7d36a6a4176a +signal 20b4fb485227404329e41ad15588afad3df23050 +clk 98d147f50eb0ce4328e013f5f2c076896003c761 +random 13aa93c70e716b597d2451abee5e9f0b140b831c +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +aio 668044a5d632e979ae3cf850f269f8dbbcb3c396 +llvmlinux 64260a5bd412519bf99f9b5b60d0452089ea492f +documentation 0415447aa3b4decc2c05dfc45a0aa34a5eb4fc54 +kselftest 49296470830aa12027f4aa43ec54f19375be095b +signal-cleanup b9f0fb2d4a7a034ee24f0a3d596fb731eb9bba72 +akpm-current 833628771769063487eeab6ae24a0e14e2464271 +akpm 1a99c82c858f21a16670a40df38bc9661ed14afd diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..df217f416d75 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,230 @@ +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#for-linus +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.secretlab.ca/git/linux#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://www.jni.nu/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 +powernv-cpuidle git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#powernv-cpuidle +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 +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 +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/eparis/audit.git#master +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +devicetree git git://git.secretlab.ca/git/linux#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 +signal-cleanup git git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc.git#signal_v4 +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..1ffcf59d88b0 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8306 @@ +$ date +Friday 10 October 09:32:32 AEDT 2014 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at d5935b07da53 Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc +Merging origin/master (80213c03c415 Merge tag 'pci-v3.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) +$ git merge origin/master +Updating d5935b07da53..80213c03c415 +Fast-forward + Documentation/ABI/testing/sysfs-bus-pci | 10 + + Documentation/devicetree/bindings/bus/bcma.txt | 32 + + .../devicetree/bindings/gpio/gpio-dsp-keystone.txt | 39 + + .../devicetree/bindings/gpio/gpio-pca953x.txt | 39 + + .../devicetree/bindings/gpio/gpio-xgene.txt | 22 + + .../devicetree/bindings/gpio/mrvl-gpio.txt | 15 +- + .../bindings/interrupt-controller/atmel,aic.txt | 2 +- + .../interrupt-controller/brcm,bcm7120-l2-intc.txt | 86 + + .../interrupt-controller/renesas,intc-irqpin.txt | 8 +- + .../bindings/interrupt-controller/renesas,irqc.txt | 32 + + .../interrupt-controller/ti,keystone-irq.txt | 36 + + .../bindings/net/broadcom-mdio-unimac.txt | 39 + + .../devicetree/bindings/net/broadcom-sf2.txt | 78 + + .../devicetree/bindings/net/can/m_can.txt | 67 + + .../devicetree/bindings/net/can/rcar_can.txt | 43 + + Documentation/devicetree/bindings/net/cpsw.txt | 6 +- + Documentation/devicetree/bindings/net/dsa/dsa.txt | 17 + + .../devicetree/bindings/net/emac_rockchip.txt | 50 + + Documentation/devicetree/bindings/net/fsl-fec.txt | 6 + + .../devicetree/bindings/net/marvell-pxa168.txt | 36 + + .../devicetree/bindings/net/meson-dwmac.txt | 25 + + .../devicetree/bindings/net/nfc/st21nfcb.txt | 2 +- + .../devicetree/bindings/net/nfc/trf7970a.txt | 8 + + .../devicetree/bindings/net/qca-qca7000-spi.txt | 47 + + .../devicetree/bindings/net/socfpga-dwmac.txt | 4 + + .../devicetree/bindings/pci/designware-pcie.txt | 3 + + .../bindings/pci/nvidia,tegra20-pcie.txt | 25 +- + .../devicetree/bindings/pci/pci-keystone.txt | 63 + + .../devicetree/bindings/pci/xgene-pci.txt | 57 + + .../devicetree/bindings/pci/xilinx-pcie.txt | 62 + + .../bindings/timer/amlogic,meson6-timer.txt | 15 + + .../devicetree/bindings/timer/renesas,cmt.txt | 44 +- + .../devicetree/bindings/timer/renesas,mtu2.txt | 7 +- + .../devicetree/bindings/timer/renesas,tmu.txt | 7 +- + Documentation/driver-model/devres.txt | 2 + + Documentation/gpio/driver.txt | 6 +- + Documentation/networking/dctcp.txt | 43 + + Documentation/networking/filter.txt | 271 +- + Documentation/networking/ip-sysctl.txt | 40 +- + Documentation/networking/pktgen.txt | 3 + + Documentation/networking/timestamping.txt | 368 +- + Documentation/networking/timestamping/Makefile | 8 +- + .../networking/timestamping/txtimestamp.c | 469 ++ + Documentation/sysctl/net.txt | 16 + + MAINTAINERS | 54 +- + arch/alpha/include/asm/Kbuild | 1 + + arch/arc/include/asm/Kbuild | 1 + + arch/arm/Kconfig | 1 + + arch/arm/boot/dts/am33xx.dtsi | 6 + + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 4 + + arch/arm/boot/dts/berlin2q.dtsi | 17 + + arch/arm/boot/dts/imx6sx.dtsi | 2 + + arch/arm/boot/dts/rk3188-radxarock.dts | 22 + + arch/arm/boot/dts/rk3188.dtsi | 22 + + arch/arm/boot/dts/rk3xxx.dtsi | 17 + + arch/arm/boot/dts/spear1310.dtsi | 18 +- + arch/arm/boot/dts/spear1340.dtsi | 6 +- + arch/arm/common/scoop.c | 10 +- + arch/arm/include/asm/arch_timer.h | 25 - + arch/arm/include/asm/io.h | 1 + + arch/arm/include/asm/irq_work.h | 11 + + arch/arm/kernel/irq.c | 19 +- + arch/arm/kernel/smp.c | 2 +- + arch/arm/mach-imx/avic.c | 2 +- + arch/arm/mach-imx/tzic.c | 3 +- + arch/arm/mach-integrator/pci_v3.c | 23 +- + arch/arm/net/bpf_jit_32.c | 37 +- + arch/arm/net/bpf_jit_32.h | 14 + + arch/arm/plat-orion/common.c | 2 +- + arch/arm64/Kconfig | 23 +- + arch/arm64/boot/dts/apm-mustang.dts | 8 + + arch/arm64/boot/dts/apm-storm.dtsi | 165 + + arch/arm64/include/asm/Kbuild | 3 +- + arch/arm64/include/asm/arch_timer.h | 31 - + arch/arm64/include/asm/hardirq.h | 2 - + arch/arm64/include/asm/io.h | 3 +- + arch/arm64/include/asm/irq_work.h | 11 + + arch/arm64/include/asm/pci.h | 37 + + arch/arm64/include/asm/pgtable.h | 2 + + arch/arm64/include/asm/smp.h | 2 + + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/irq.c | 27 - + arch/arm64/kernel/pci.c | 70 + + arch/arm64/kernel/smp.c | 2 +- + arch/avr32/include/asm/Kbuild | 1 + + arch/blackfin/include/asm/Kbuild | 1 + + arch/c6x/include/asm/Kbuild | 1 + + arch/cris/include/asm/Kbuild | 1 + + arch/frv/include/asm/Kbuild | 1 + + arch/hexagon/include/asm/Kbuild | 1 + + arch/ia64/include/asm/Kbuild | 1 + + arch/ia64/kernel/msi_ia64.c | 2 +- + arch/ia64/sn/kernel/msi_sn.c | 4 +- + arch/m32r/include/asm/Kbuild | 1 + + arch/m68k/include/asm/Kbuild | 1 + + arch/metag/include/asm/Kbuild | 1 + + arch/microblaze/include/asm/Kbuild | 1 + + arch/mips/bcm47xx/setup.c | 4 + + arch/mips/include/asm/Kbuild | 1 + + arch/mips/net/bpf_jit.c | 33 +- + arch/mips/pci/msi-octeon.c | 6 +- + arch/mips/txx9/generic/setup.c | 4 +- + arch/mn10300/include/asm/Kbuild | 1 + + arch/openrisc/Kconfig | 1 + + arch/openrisc/include/asm/Kbuild | 1 + + arch/openrisc/include/asm/irq.h | 1 - + arch/openrisc/kernel/irq.c | 12 - + arch/parisc/include/asm/Kbuild | 1 + + arch/powerpc/include/asm/Kbuild | 1 + + arch/powerpc/include/asm/machdep.h | 2 - + arch/powerpc/kernel/msi.c | 12 +- + arch/powerpc/net/bpf_jit_comp.c | 5 +- + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 3 +- + arch/powerpc/platforms/cell/axon_msi.c | 9 - + arch/powerpc/platforms/powernv/pci.c | 19 +- + arch/powerpc/platforms/pseries/msi.c | 44 +- + arch/powerpc/sysdev/fsl_msi.c | 12 +- + arch/powerpc/sysdev/mpic_pasemi_msi.c | 11 +- + arch/powerpc/sysdev/mpic_u3msi.c | 28 +- + arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 18 +- + arch/powerpc/sysdev/ppc4xx_msi.c | 19 +- + arch/s390/include/asm/Kbuild | 1 + + arch/s390/net/bpf_jit_comp.c | 84 +- + arch/score/include/asm/Kbuild | 1 + + arch/sh/boards/mach-x3proto/gpio.c | 6 +- + arch/sh/include/asm/Kbuild | 1 + + arch/sparc/include/asm/Kbuild | 1 + + arch/sparc/include/asm/vio.h | 44 +- + arch/sparc/kernel/ldc.c | 2 +- + arch/sparc/kernel/viohs.c | 14 +- + arch/sparc/net/bpf_jit_comp.c | 21 +- + arch/tile/include/asm/Kbuild | 1 + + arch/um/include/asm/Kbuild | 1 + + arch/unicore32/include/asm/Kbuild | 1 + + arch/x86/include/asm/irq_work.h | 11 + + arch/x86/kernel/irq_work.c | 2 +- + arch/x86/net/bpf_jit_comp.c | 129 +- + arch/x86/pci/common.c | 20 +- + arch/x86/pci/mmconfig-shared.c | 40 +- + arch/x86/pci/pcbios.c | 8 +- + arch/x86/syscalls/syscall_32.tbl | 1 + + arch/x86/syscalls/syscall_64.tbl | 1 + + arch/xtensa/include/asm/Kbuild | 1 + + drivers/bcma/Makefile | 1 + + drivers/bcma/bcma_private.h | 18 + + drivers/bcma/driver_chipcommon_b.c | 61 + + drivers/bcma/driver_gpio.c | 11 +- + drivers/bcma/driver_mips.c | 62 + + drivers/bcma/host_pci.c | 3 + + drivers/bcma/host_soc.c | 99 +- + drivers/bcma/main.c | 150 +- + drivers/bcma/scan.c | 34 +- + drivers/bluetooth/Kconfig | 4 +- + drivers/bluetooth/ath3k.c | 2 + + drivers/bluetooth/bluecard_cs.c | 35 +- + drivers/bluetooth/bt3c_cs.c | 27 +- + drivers/bluetooth/btmrvl_sdio.c | 36 +- + drivers/bluetooth/btuart_cs.c | 27 +- + drivers/bluetooth/btusb.c | 525 ++- + drivers/bluetooth/dtl1_cs.c | 36 +- + drivers/bluetooth/hci_h5.c | 2 +- + drivers/clocksource/Kconfig | 3 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/arm_arch_timer.c | 64 +- + drivers/clocksource/cadence_ttc_timer.c | 15 +- + drivers/clocksource/meson6_timer.c | 167 + + drivers/clocksource/timer-marco.c | 5 +- + drivers/clocksource/vf_pit_timer.c | 4 + + drivers/gpio/Kconfig | 14 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-adnp.c | 155 +- + drivers/gpio/gpio-bcm-kona.c | 2 +- + drivers/gpio/gpio-crystalcove.c | 28 +- + drivers/gpio/gpio-cs5535.c | 9 +- + drivers/gpio/gpio-dwapb.c | 410 +- + drivers/gpio/gpio-ks8695.c | 30 +- + drivers/gpio/gpio-mcp23s08.c | 64 +- + drivers/gpio/gpio-omap.c | 33 +- + drivers/gpio/gpio-pca953x.c | 54 +- + drivers/gpio/gpio-pch.c | 2 + + drivers/gpio/gpio-samsung.c | 50 - + drivers/gpio/gpio-stmpe.c | 99 +- + drivers/gpio/gpio-stp-xway.c | 2 +- + drivers/gpio/gpio-syscon.c | 94 +- + drivers/gpio/gpio-tc3589x.c | 5 + + drivers/gpio/gpio-xgene.c | 244 + + drivers/gpio/gpio-xilinx.c | 27 +- + drivers/gpio/gpio-zynq.c | 89 +- + drivers/gpio/gpiolib-acpi.c | 30 +- + drivers/gpio/gpiolib.c | 90 +- + drivers/gpu/drm/vmwgfx/svga_reg.h | 1 - + drivers/hid/hid-cp2112.c | 6 +- + drivers/infiniband/hw/mlx5/cq.c | 8 +- + drivers/infiniband/hw/mlx5/mad.c | 2 +- + drivers/infiniband/hw/mlx5/main.c | 83 +- + drivers/infiniband/hw/mlx5/qp.c | 72 +- + drivers/infiniband/hw/mlx5/srq.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/input/keyboard/adp5588-keys.c | 4 +- + drivers/input/keyboard/adp5589-keys.c | 4 +- + drivers/input/touchscreen/ad7879.c | 10 +- + drivers/irqchip/Kconfig | 7 + + drivers/irqchip/Makefile | 5 +- + drivers/irqchip/irq-armada-370-xp.c | 33 +- + drivers/irqchip/irq-atmel-aic.c | 4 +- + drivers/irqchip/irq-atmel-aic5.c | 16 +- + drivers/irqchip/irq-bcm7120-l2.c | 219 + + drivers/irqchip/irq-clps711x.c | 18 +- + drivers/irqchip/irq-gic-common.c | 15 +- + drivers/irqchip/irq-gic-v3.c | 100 +- + drivers/irqchip/irq-gic.c | 49 +- + drivers/irqchip/irq-hip04.c | 424 ++ + drivers/irqchip/irq-keystone.c | 232 + + drivers/irqchip/irq-mmp.c | 10 +- + drivers/irqchip/irq-mxs.c | 3 +- + drivers/irqchip/irq-omap-intc.c | 3 +- + drivers/irqchip/irq-or1k-pic.c | 4 +- + drivers/irqchip/irq-orion.c | 5 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 85 +- + drivers/irqchip/irq-s3c24xx.c | 4 +- + drivers/irqchip/irq-sirfsoc.c | 6 +- + drivers/irqchip/irq-sun4i.c | 5 +- + drivers/irqchip/irq-versatile-fpga.c | 2 +- + drivers/irqchip/irq-vic.c | 2 +- + drivers/irqchip/irq-vt8500.c | 5 +- + drivers/irqchip/irq-zevio.c | 3 +- + drivers/isdn/capi/capiutil.c | 3 - + drivers/isdn/gigaset/bas-gigaset.c | 2 +- + drivers/isdn/gigaset/ev-layer.c | 3 +- + drivers/isdn/gigaset/usb-gigaset.c | 14 +- + drivers/isdn/mISDN/dsp_cmx.c | 109 +- + drivers/leds/leds-pca9532.c | 10 +- + drivers/leds/leds-tca6507.c | 7 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 10 +- + drivers/mfd/asic3.c | 3 +- + drivers/mfd/htc-i2cpld.c | 8 +- + drivers/mfd/sm501.c | 17 +- + drivers/mfd/tc6393xb.c | 13 +- + drivers/mfd/ucb1x00-core.c | 8 +- + drivers/misc/vmw_vmci/vmci_guest.c | 1 - + drivers/net/Kconfig | 1 - + drivers/net/appletalk/ipddp.c | 2 +- + drivers/net/arcnet/arcnet.c | 2 +- + drivers/net/arcnet/com20020-pci.c | 369 +- + drivers/net/arcnet/com20020.c | 14 + + drivers/net/arcnet/com20020_cs.c | 4 - + drivers/net/bonding/bond_3ad.c | 230 +- + drivers/net/bonding/bond_3ad.h | 1 - + drivers/net/bonding/bond_alb.c | 305 +- + drivers/net/bonding/bond_alb.h | 10 - + drivers/net/bonding/bond_debugfs.c | 8 +- + drivers/net/bonding/bond_main.c | 629 +-- + drivers/net/bonding/bond_netlink.c | 41 +- + drivers/net/bonding/bond_options.c | 39 +- + drivers/net/bonding/bond_procfs.c | 27 +- + drivers/net/bonding/bond_sysfs.c | 11 +- + drivers/net/bonding/bonding.h | 45 +- + drivers/net/can/Kconfig | 4 +- + drivers/net/can/Makefile | 3 +- + drivers/net/can/c_can/Makefile | 2 - + drivers/net/can/cc770/Makefile | 2 - + drivers/net/can/dev.c | 3 +- + drivers/net/can/flexcan.c | 114 +- + drivers/net/can/m_can/Kconfig | 4 + + drivers/net/can/m_can/Makefile | 5 + + drivers/net/can/m_can/m_can.c | 1202 +++++ + drivers/net/can/mscan/Makefile | 2 - + drivers/net/can/rcar_can.c | 66 +- + drivers/net/can/sja1000/Makefile | 2 - + drivers/net/can/softing/Makefile | 2 - + drivers/net/can/spi/Makefile | 2 - + drivers/net/can/spi/mcp251x.c | 16 +- + drivers/net/can/usb/Makefile | 2 - + drivers/net/dsa/Kconfig | 21 + + drivers/net/dsa/Makefile | 4 + + drivers/net/dsa/bcm_sf2.c | 887 ++++ + drivers/net/dsa/bcm_sf2.h | 147 + + drivers/net/dsa/bcm_sf2_regs.h | 231 + + drivers/net/dsa/mv88e6060.c | 15 +- + drivers/net/dsa/mv88e6123_61_65.c | 10 +- + drivers/net/dsa/mv88e6131.c | 8 +- + drivers/net/dsa/mv88e6171.c | 411 ++ + drivers/net/dsa/mv88e6xxx.c | 10 +- + drivers/net/dsa/mv88e6xxx.h | 1 + + drivers/net/eql.c | 2 +- + drivers/net/ethernet/3com/3c509.c | 6 +- + drivers/net/ethernet/3com/3c515.c | 25 +- + drivers/net/ethernet/3com/3c59x.c | 29 +- + drivers/net/ethernet/Kconfig | 2 + + drivers/net/ethernet/Makefile | 2 + + drivers/net/ethernet/adi/bfin_mac.c | 3 - + drivers/net/ethernet/agere/Kconfig | 31 + + drivers/net/ethernet/agere/Makefile | 5 + + drivers/net/ethernet/agere/et131x.c | 4121 +++++++++++++++++ + drivers/net/ethernet/agere/et131x.h | 1433 ++++++ + drivers/net/ethernet/allwinner/sun4i-emac.c | 2 - + drivers/net/ethernet/altera/altera_tse_main.c | 66 +- + drivers/net/ethernet/amd/au1000_eth.c | 6 +- + drivers/net/ethernet/amd/nmclan_cs.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-common.h | 11 - + drivers/net/ethernet/amd/xgbe/xgbe-dcb.c | 1 - + drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 1 - + drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 6 +- + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 1 - + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 1 - + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 1 - + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 1 - + drivers/net/ethernet/amd/xgbe/xgbe-ptp.c | 1 - + drivers/net/ethernet/amd/xgbe/xgbe.h | 2 - + drivers/net/ethernet/arc/Kconfig | 18 +- + drivers/net/ethernet/arc/Makefile | 4 +- + drivers/net/ethernet/arc/emac.h | 8 +- + drivers/net/ethernet/arc/emac_arc.c | 95 + + drivers/net/ethernet/arc/emac_main.c | 129 +- + drivers/net/ethernet/arc/emac_mdio.c | 7 +- + drivers/net/ethernet/arc/emac_rockchip.c | 229 + + drivers/net/ethernet/broadcom/Kconfig | 1 + + drivers/net/ethernet/broadcom/b44.c | 2 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 31 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 93 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 140 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 19 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 5 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h | 14 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 44 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 222 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 257 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 1048 ++++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 178 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 169 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 85 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 48 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 3 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 10 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 9 - + drivers/net/ethernet/broadcom/cnic.c | 6 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 88 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 6 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 91 +- + drivers/net/ethernet/brocade/bna/bna_enet.c | 9 +- + drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 6 +- + drivers/net/ethernet/brocade/bna/bnad.c | 2 +- + drivers/net/ethernet/cadence/at91_ether.c | 1 - + drivers/net/ethernet/cadence/macb.c | 6 +- + drivers/net/ethernet/calxeda/xgmac.c | 1 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 5 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 32 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 218 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 27 + + drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 9 +- + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 20 + + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 107 +- + drivers/net/ethernet/cisco/enic/enic.h | 1 + + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 39 + + drivers/net/ethernet/cisco/enic/enic_main.c | 50 +- + drivers/net/ethernet/cisco/enic/vnic_dev.c | 3 +- + drivers/net/ethernet/davicom/dm9000.c | 3 - + drivers/net/ethernet/dec/tulip/dmfe.c | 152 +- + drivers/net/ethernet/ec_bhf.c | 101 +- + drivers/net/ethernet/emulex/benet/be.h | 30 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 182 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 48 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 173 +- + drivers/net/ethernet/emulex/benet/be_hw.h | 12 + + drivers/net/ethernet/emulex/benet/be_main.c | 368 +- + drivers/net/ethernet/emulex/benet/be_roce.c | 1 + + drivers/net/ethernet/ethoc.c | 2 - + drivers/net/ethernet/freescale/fec.h | 204 +- + drivers/net/ethernet/freescale/fec_main.c | 1218 +++-- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 211 +- + drivers/net/ethernet/freescale/fs_enet/fs_enet.h | 9 +- + drivers/net/ethernet/freescale/fs_enet/mac-fcc.c | 29 + + drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 29 + + drivers/net/ethernet/freescale/fs_enet/mac-scc.c | 29 + + drivers/net/ethernet/hp/hp100.c | 4 +- + drivers/net/ethernet/intel/Kconfig | 19 + + drivers/net/ethernet/intel/Makefile | 1 + + drivers/net/ethernet/intel/e1000/e1000.h | 19 +- + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 187 +- + drivers/net/ethernet/intel/e1000/e1000_hw.c | 78 - + drivers/net/ethernet/intel/e1000/e1000_hw.h | 2 - + drivers/net/ethernet/intel/e1000/e1000_main.c | 498 +- + drivers/net/ethernet/intel/fm10k/Makefile | 33 + + drivers/net/ethernet/intel/fm10k/fm10k.h | 530 +++ + drivers/net/ethernet/intel/fm10k/fm10k_common.c | 534 +++ + drivers/net/ethernet/intel/fm10k/fm10k_common.h | 65 + + drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c | 174 + + drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 259 ++ + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 1071 +++++ + drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 536 +++ + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 1979 ++++++++ + drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 2125 +++++++++ + drivers/net/ethernet/intel/fm10k/fm10k_mbx.h | 307 ++ + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 1435 ++++++ + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2166 +++++++++ + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 1880 ++++++++ + drivers/net/ethernet/intel/fm10k/fm10k_pf.h | 135 + + drivers/net/ethernet/intel/fm10k/fm10k_ptp.c | 463 ++ + drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 863 ++++ + drivers/net/ethernet/intel/fm10k/fm10k_tlv.h | 186 + + drivers/net/ethernet/intel/fm10k/fm10k_type.h | 770 ++++ + drivers/net/ethernet/intel/fm10k/fm10k_vf.c | 578 +++ + drivers/net/ethernet/intel/fm10k/fm10k_vf.h | 78 + + drivers/net/ethernet/intel/i40e/i40e.h | 9 + + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 10 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 3 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 70 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 259 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 6 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 182 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 50 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 2 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 9 +- + drivers/net/ethernet/intel/i40evf/i40e_common.c | 8 +- + drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 6 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 8 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 1 + + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 31 +- + drivers/net/ethernet/intel/igb/e1000_82575.h | 4 +- + drivers/net/ethernet/intel/igb/e1000_hw.h | 5 - + drivers/net/ethernet/intel/igb/igb.h | 1 - + drivers/net/ethernet/intel/igb/igb_ethtool.c | 24 +- + drivers/net/ethernet/intel/igb/igb_main.c | 220 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 117 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 160 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 316 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 41 - + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 14 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 7 + + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 2 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 1 - + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 4 - + drivers/net/ethernet/intel/ixgbevf/vf.c | 15 + + drivers/net/ethernet/lantiq_etop.c | 1 - + drivers/net/ethernet/marvell/Kconfig | 2 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 219 +- + drivers/net/ethernet/marvell/skge.c | 6 +- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 14 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 45 + + drivers/net/ethernet/mellanox/mlx4/en_main.c | 17 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 1 + + drivers/net/ethernet/mellanox/mlx4/en_port.c | 17 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 23 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 400 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 30 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 47 +- + drivers/net/ethernet/mellanox/mlx4/fw.h | 2 + + drivers/net/ethernet/mellanox/mlx4/main.c | 482 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 3 + + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 101 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 77 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 81 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 230 +- + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 60 +- + drivers/net/ethernet/mellanox/mlx5/core/uar.c | 4 +- + drivers/net/ethernet/moxa/moxart_ether.c | 1 - + drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- + drivers/net/ethernet/netx-eth.c | 2 - + drivers/net/ethernet/nuvoton/w90p910_ether.c | 1 - + drivers/net/ethernet/nvidia/forcedeth.c | 2 +- + drivers/net/ethernet/nxp/lpc_eth.c | 3 - + drivers/net/ethernet/packetengines/yellowfin.c | 4 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 5 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 8 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 218 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 156 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 6 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 10 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 4 +- + drivers/net/ethernet/qualcomm/Kconfig | 30 + + drivers/net/ethernet/qualcomm/Makefile | 6 + + drivers/net/ethernet/qualcomm/qca_7k.c | 149 + + drivers/net/ethernet/qualcomm/qca_7k.h | 72 + + drivers/net/ethernet/qualcomm/qca_debug.c | 311 ++ + drivers/net/ethernet/qualcomm/qca_debug.h | 34 + + drivers/net/ethernet/qualcomm/qca_framing.c | 156 + + drivers/net/ethernet/qualcomm/qca_framing.h | 134 + + drivers/net/ethernet/qualcomm/qca_spi.c | 991 ++++ + drivers/net/ethernet/qualcomm/qca_spi.h | 114 + + drivers/net/ethernet/realtek/r8169.c | 1437 +++++- + drivers/net/ethernet/sfc/tx.c | 2 +- + drivers/net/ethernet/smsc/smc911x.c | 3 - + drivers/net/ethernet/smsc/smc91x.c | 3 - + drivers/net/ethernet/smsc/smsc911x.c | 1 - + drivers/net/ethernet/stmicro/stmmac/Kconfig | 10 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 67 + + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 62 + + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 3 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 18 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 4 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 + + drivers/net/ethernet/sun/cassini.c | 2 +- + drivers/net/ethernet/sun/niu.c | 4 +- + drivers/net/ethernet/sun/sungem.c | 34 +- + drivers/net/ethernet/sun/sunvnet.c | 433 +- + drivers/net/ethernet/sun/sunvnet.h | 20 +- + drivers/net/ethernet/ti/Kconfig | 2 + + drivers/net/ethernet/ti/cpmac.c | 1 - + drivers/net/ethernet/ti/cpsw-phy-sel.c | 1 - + drivers/net/ethernet/ti/cpsw.c | 105 +- + drivers/net/ethernet/ti/cpsw.h | 1 + + drivers/net/ethernet/ti/davinci_emac.c | 1 - + drivers/net/ethernet/ti/davinci_mdio.c | 1 - + drivers/net/ethernet/tile/tilepro.c | 8 +- + drivers/net/ethernet/toshiba/spider_net.c | 42 +- + drivers/net/ethernet/wiznet/w5100.c | 1 - + drivers/net/ethernet/wiznet/w5300.c | 1 - + drivers/net/ethernet/xilinx/ll_temac_main.c | 1 - + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 1 - + drivers/net/fddi/defxx.c | 64 +- + drivers/net/fddi/defxx.h | 12 +- + drivers/net/hyperv/hyperv_net.h | 4 +- + drivers/net/hyperv/netvsc.c | 37 +- + drivers/net/ieee802154/mrf24j40.c | 19 +- + drivers/net/ifb.c | 3 +- + drivers/net/irda/Kconfig | 2 +- + drivers/net/irda/vlsi_ir.c | 8 +- + drivers/net/loopback.c | 2 +- + drivers/net/macvlan.c | 307 +- + drivers/net/phy/Kconfig | 11 +- + drivers/net/phy/Makefile | 1 + + drivers/net/phy/amd-xgbe-phy.c | 168 +- + drivers/net/phy/bcm7xxx.c | 153 +- + drivers/net/phy/broadcom.c | 122 - + drivers/net/phy/dp83640.c | 35 +- + drivers/net/phy/fixed.c | 27 +- + drivers/net/phy/mdio-bcm-unimac.c | 213 + + drivers/net/phy/mdio_bus.c | 8 +- + drivers/net/phy/phy.c | 12 +- + drivers/net/phy/phy_device.c | 4 +- + drivers/net/ppp/ppp_generic.c | 2 +- + drivers/net/sungem_phy.c | 304 +- + drivers/net/team/team.c | 56 +- + drivers/net/usb/asix_devices.c | 2 +- + drivers/net/usb/r8152.c | 509 +- + drivers/net/virtio_net.c | 9 +- + drivers/net/vmxnet3/vmxnet3_int.h | 1 - + drivers/net/vxlan.c | 97 +- + drivers/net/wan/dlci.c | 6 +- + drivers/net/wan/hdlc_fr.c | 2 +- + drivers/net/wireless/ath/Kconfig | 8 + + drivers/net/wireless/ath/Makefile | 4 + + drivers/net/wireless/ath/ath.h | 4 + + drivers/net/wireless/ath/ath10k/Kconfig | 3 +- + drivers/net/wireless/ath/ath10k/Makefile | 2 + + drivers/net/wireless/ath/ath10k/bmi.c | 52 +- + drivers/net/wireless/ath/ath10k/bmi.h | 1 - + drivers/net/wireless/ath/ath10k/ce.c | 185 +- + drivers/net/wireless/ath/ath10k/ce.h | 41 +- + drivers/net/wireless/ath/ath10k/core.c | 340 +- + drivers/net/wireless/ath/ath10k/core.h | 89 +- + drivers/net/wireless/ath/ath10k/debug.c | 399 +- + drivers/net/wireless/ath/ath10k/debug.h | 46 +- + drivers/net/wireless/ath/ath10k/hif.h | 1 - + drivers/net/wireless/ath/ath10k/htc.c | 121 +- + drivers/net/wireless/ath/ath10k/htc.h | 8 +- + drivers/net/wireless/ath/ath10k/htt.c | 11 +- + drivers/net/wireless/ath/ath10k/htt.h | 3 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 217 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 48 +- + drivers/net/wireless/ath/ath10k/hw.h | 7 +- + drivers/net/wireless/ath/ath10k/mac.c | 898 ++-- + drivers/net/wireless/ath/ath10k/mac.h | 6 +- + drivers/net/wireless/ath/ath10k/pci.c | 1638 +++---- + drivers/net/wireless/ath/ath10k/pci.h | 104 +- + drivers/net/wireless/ath/ath10k/rx_desc.h | 1 - + drivers/net/wireless/ath/ath10k/spectral.c | 561 +++ + drivers/net/wireless/ath/ath10k/spectral.h | 90 + + drivers/net/wireless/ath/ath10k/targaddrs.h | 1 - + drivers/net/wireless/ath/ath10k/testmode.c | 382 ++ + drivers/net/wireless/ath/ath10k/testmode.h | 46 + + drivers/net/wireless/ath/ath10k/testmode_i.h | 70 + + drivers/net/wireless/ath/ath10k/trace.h | 105 +- + drivers/net/wireless/ath/ath10k/txrx.c | 19 +- + drivers/net/wireless/ath/ath10k/wmi.c | 1184 +++-- + drivers/net/wireless/ath/ath10k/wmi.h | 726 ++- + drivers/net/wireless/ath/ath5k/Kconfig | 14 +- + drivers/net/wireless/ath/ath5k/Makefile | 1 - + drivers/net/wireless/ath/ath5k/ahb.c | 234 - + drivers/net/wireless/ath/ath5k/ath5k.h | 28 - + drivers/net/wireless/ath/ath5k/attach.c | 3 +- + drivers/net/wireless/ath/ath5k/base.c | 16 +- + drivers/net/wireless/ath/ath5k/debug.c | 98 + + drivers/net/wireless/ath/ath5k/led.c | 7 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 1 + + drivers/net/wireless/ath/ath6kl/init.c | 2 +- + drivers/net/wireless/ath/ath6kl/main.c | 2 +- + drivers/net/wireless/ath/ath6kl/sdio.c | 1 + + drivers/net/wireless/ath/ath6kl/usb.c | 21 +- + drivers/net/wireless/ath/ath6kl/wmi.c | 48 +- + drivers/net/wireless/ath/ath9k/Kconfig | 18 + + drivers/net/wireless/ath/ath9k/Makefile | 3 + + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 9 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 19 + + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 19 + + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 24 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 169 +- + drivers/net/wireless/ath/ath9k/beacon.c | 73 +- + drivers/net/wireless/ath/ath9k/channel.c | 1485 ++++-- + drivers/net/wireless/ath/ath9k/debug.c | 30 +- + drivers/net/wireless/ath/ath9k/dynack.c | 351 ++ + drivers/net/wireless/ath/ath9k/dynack.h | 103 + + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 + + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +- + drivers/net/wireless/ath/ath9k/hw-ops.h | 6 + + drivers/net/wireless/ath/ath9k/hw.c | 51 +- + drivers/net/wireless/ath/ath9k/hw.h | 8 + + drivers/net/wireless/ath/ath9k/init.c | 90 +- + drivers/net/wireless/ath/ath9k/mac.h | 1 + + drivers/net/wireless/ath/ath9k/main.c | 700 ++- + drivers/net/wireless/ath/ath9k/recv.c | 62 +- + drivers/net/wireless/ath/ath9k/reg.h | 15 + + drivers/net/wireless/ath/ath9k/spectral.h | 71 +- + drivers/net/wireless/ath/ath9k/tx99.c | 2 +- + drivers/net/wireless/ath/ath9k/wow.c | 5 +- + drivers/net/wireless/ath/ath9k/xmit.c | 41 +- + drivers/net/wireless/ath/carl9170/main.c | 11 +- + drivers/net/wireless/ath/carl9170/tx.c | 2 +- + drivers/net/wireless/ath/main.c | 3 + + drivers/net/wireless/ath/spectral_common.h | 113 + + drivers/net/wireless/ath/trace.c | 20 + + drivers/net/wireless/ath/trace.h | 71 + + drivers/net/wireless/ath/wil6210/Kconfig | 9 + + drivers/net/wireless/ath/wil6210/Makefile | 5 + + drivers/net/wireless/ath/wil6210/cfg80211.c | 136 +- + drivers/net/wireless/ath/wil6210/debug.c | 18 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 456 +- + drivers/net/wireless/ath/wil6210/ethtool.c | 103 + + drivers/net/wireless/ath/wil6210/fw.c | 45 + + drivers/net/wireless/ath/wil6210/fw.h | 149 + + drivers/net/wireless/ath/wil6210/fw_inc.c | 495 ++ + drivers/net/wireless/ath/wil6210/interrupt.c | 45 +- + drivers/net/wireless/ath/wil6210/ioctl.c | 173 + + drivers/net/wireless/ath/wil6210/main.c | 277 +- + drivers/net/wireless/ath/wil6210/netdev.c | 38 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 46 +- + drivers/net/wireless/ath/wil6210/rx_reorder.c | 29 +- + drivers/net/wireless/ath/wil6210/txrx.c | 69 +- + drivers/net/wireless/ath/wil6210/txrx.h | 11 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 94 +- + drivers/net/wireless/ath/wil6210/wil_platform.c | 49 + + drivers/net/wireless/ath/wil6210/wil_platform.h | 34 + + .../net/wireless/ath/wil6210/wil_platform_msm.c | 257 ++ + .../net/wireless/ath/wil6210/wil_platform_msm.h | 24 + + drivers/net/wireless/ath/wil6210/wmi.c | 90 +- + drivers/net/wireless/ath/wil6210/wmi.h | 22 +- + drivers/net/wireless/atmel_cs.c | 22 +- + drivers/net/wireless/b43/Makefile | 1 + + drivers/net/wireless/b43/b43.h | 27 + + drivers/net/wireless/b43/bus.c | 10 + + drivers/net/wireless/b43/bus.h | 15 + + drivers/net/wireless/b43/main.c | 88 +- + drivers/net/wireless/b43/main.h | 2 + + drivers/net/wireless/b43/phy_a.c | 4 +- + drivers/net/wireless/b43/phy_common.c | 25 +- + drivers/net/wireless/b43/phy_g.c | 8 +- + drivers/net/wireless/b43/phy_ht.c | 225 +- + drivers/net/wireless/b43/phy_ht.h | 7 +- + drivers/net/wireless/b43/phy_lcn.c | 20 +- + drivers/net/wireless/b43/phy_lp.c | 20 +- + drivers/net/wireless/b43/phy_n.c | 130 +- + drivers/net/wireless/b43/phy_n.h | 4 + + drivers/net/wireless/b43/ppr.c | 199 + + drivers/net/wireless/b43/ppr.h | 45 + + drivers/net/wireless/b43/radio_2059.c | 341 +- + drivers/net/wireless/b43/radio_2059.h | 14 + + drivers/net/wireless/b43/tables_nphy.c | 128 +- + drivers/net/wireless/b43/tables_nphy.h | 2 + + drivers/net/wireless/b43/xmit.h | 22 +- + drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 11 + + drivers/net/wireless/brcm80211/brcmfmac/feature.c | 2 + + drivers/net/wireless/brcm80211/brcmfmac/feature.h | 3 +- + drivers/net/wireless/brcm80211/brcmfmac/flowring.c | 4 +- + .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 56 + + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 133 +- + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 11 +- + drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 74 +- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 132 +- + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 7 +- + drivers/net/wireless/brcm80211/brcmsmac/dma.c | 38 +- + .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c | 122 +- + .../net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c | 6 +- + .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 8 +- + drivers/net/wireless/brcm80211/include/defs.h | 5 +- + drivers/net/wireless/cw1200/cw1200_spi.c | 4 +- + drivers/net/wireless/hostap/hostap_proc.c | 6 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 6 +- + drivers/net/wireless/iwlegacy/4965-mac.c | 7 +- + drivers/net/wireless/iwlwifi/Kconfig | 10 + + drivers/net/wireless/iwlwifi/dvm/mac80211.c | 4 +- + drivers/net/wireless/iwlwifi/dvm/tx.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-7000.c | 17 +- + drivers/net/wireless/iwlwifi/iwl-8000.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-config.h | 6 + + drivers/net/wireless/iwlwifi/iwl-csr.h | 12 + + drivers/net/wireless/iwlwifi/iwl-debug.h | 2 + + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 7 - + drivers/net/wireless/iwlwifi/iwl-drv.c | 30 +- + drivers/net/wireless/iwlwifi/iwl-drv.h | 2 + + drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 3 + + drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 2 + + drivers/net/wireless/iwlwifi/iwl-fw-file.h | 2 + + drivers/net/wireless/iwlwifi/iwl-fw.h | 24 +- + drivers/net/wireless/iwlwifi/iwl-io.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 5 + + drivers/net/wireless/iwlwifi/iwl-op-mode.h | 2 + + drivers/net/wireless/iwlwifi/iwl-prph.h | 3 + + drivers/net/wireless/iwlwifi/iwl-scd.h | 118 + + drivers/net/wireless/iwlwifi/iwl-trans.h | 63 +- + drivers/net/wireless/iwlwifi/mvm/Makefile | 2 +- + drivers/net/wireless/iwlwifi/mvm/coex.c | 6 + + drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 2 + + drivers/net/wireless/iwlwifi/mvm/constants.h | 13 +- + drivers/net/wireless/iwlwifi/mvm/d3.c | 4 +- + drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 10 + + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 116 + + drivers/net/wireless/iwlwifi/mvm/debugfs.h | 2 + + drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h | 2 + + drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 2 + + drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 2 + + drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 5 + + drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 2 + + drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 2 + + drivers/net/wireless/iwlwifi/mvm/fw-api.h | 144 +- + drivers/net/wireless/iwlwifi/mvm/fw.c | 9 +- + drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 126 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 293 +- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 114 +- + drivers/net/wireless/iwlwifi/mvm/nvm.c | 5 +- + drivers/net/wireless/iwlwifi/mvm/offloading.c | 2 + + drivers/net/wireless/iwlwifi/mvm/ops.c | 35 +- + drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 2 + + drivers/net/wireless/iwlwifi/mvm/power.c | 210 +- + drivers/net/wireless/iwlwifi/mvm/quota.c | 46 +- + drivers/net/wireless/iwlwifi/mvm/rs.c | 372 +- + drivers/net/wireless/iwlwifi/mvm/rs.h | 14 +- + drivers/net/wireless/iwlwifi/mvm/rx.c | 62 +- + drivers/net/wireless/iwlwifi/mvm/scan.c | 133 +- + drivers/net/wireless/iwlwifi/mvm/sf.c | 6 + + drivers/net/wireless/iwlwifi/mvm/sta.c | 122 +- + drivers/net/wireless/iwlwifi/mvm/sta.h | 24 +- + drivers/net/wireless/iwlwifi/mvm/tdls.c | 149 + + drivers/net/wireless/iwlwifi/mvm/testmode.h | 2 + + drivers/net/wireless/iwlwifi/mvm/time-event.c | 71 +- + drivers/net/wireless/iwlwifi/mvm/time-event.h | 16 +- + drivers/net/wireless/iwlwifi/mvm/tt.c | 322 +- + drivers/net/wireless/iwlwifi/mvm/tx.c | 64 +- + drivers/net/wireless/iwlwifi/mvm/utils.c | 69 +- + drivers/net/wireless/iwlwifi/pcie/drv.c | 7 + + drivers/net/wireless/iwlwifi/pcie/internal.h | 10 +- + drivers/net/wireless/iwlwifi/pcie/rx.c | 3 +- + drivers/net/wireless/iwlwifi/pcie/trans.c | 5 +- + drivers/net/wireless/iwlwifi/pcie/tx.c | 145 +- + drivers/net/wireless/libertas/cfg.c | 2 + + drivers/net/wireless/mac80211_hwsim.c | 8 +- + drivers/net/wireless/mwifiex/11n_rxreorder.c | 14 + + drivers/net/wireless/mwifiex/Kconfig | 4 +- + drivers/net/wireless/mwifiex/cfg80211.c | 18 +- + drivers/net/wireless/mwifiex/cmdevt.c | 31 +- + drivers/net/wireless/mwifiex/decl.h | 4 +- + drivers/net/wireless/mwifiex/fw.h | 17 +- + drivers/net/wireless/mwifiex/init.c | 24 +- + drivers/net/wireless/mwifiex/main.c | 190 +- + drivers/net/wireless/mwifiex/main.h | 49 +- + drivers/net/wireless/mwifiex/pcie.c | 54 +- + drivers/net/wireless/mwifiex/pcie.h | 5 +- + drivers/net/wireless/mwifiex/scan.c | 116 +- + drivers/net/wireless/mwifiex/sdio.c | 69 +- + drivers/net/wireless/mwifiex/sdio.h | 114 +- + drivers/net/wireless/mwifiex/sta_cmd.c | 4 +- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 4 +- + drivers/net/wireless/mwifiex/sta_ioctl.c | 13 +- + drivers/net/wireless/mwifiex/tdls.c | 4 +- + drivers/net/wireless/mwifiex/usb.c | 2 +- + drivers/net/wireless/mwifiex/util.c | 2 +- + drivers/net/wireless/orinoco/orinoco_usb.c | 38 +- + drivers/net/wireless/orinoco/scan.c | 14 +- + drivers/net/wireless/p54/main.c | 3 +- + drivers/net/wireless/ray_cs.h | 5 +- + drivers/net/wireless/rayctl.h | 5 +- + drivers/net/wireless/rndis_wlan.c | 14 +- + drivers/net/wireless/rt2x00/rt2800.h | 6 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 6 + + drivers/net/wireless/rtl818x/rtl8180/dev.c | 28 +- + drivers/net/wireless/rtlwifi/Kconfig | 29 +- + drivers/net/wireless/rtlwifi/Makefile | 2 + + drivers/net/wireless/rtlwifi/base.c | 661 ++- + drivers/net/wireless/rtlwifi/base.h | 55 +- + .../net/wireless/rtlwifi/btcoexist/halbt_precomp.h | 6 + + .../wireless/rtlwifi/btcoexist/halbtc8192e2ant.c | 3849 ++++++++++++++++ + .../wireless/rtlwifi/btcoexist/halbtc8192e2ant.h | 185 + + .../wireless/rtlwifi/btcoexist/halbtc8723b1ant.c | 3170 +++++++++++++ + .../wireless/rtlwifi/btcoexist/halbtc8723b1ant.h | 184 + + .../wireless/rtlwifi/btcoexist/halbtc8723b2ant.c | 550 +-- + .../wireless/rtlwifi/btcoexist/halbtc8723b2ant.h | 31 +- + .../wireless/rtlwifi/btcoexist/halbtc8821a1ant.c | 2970 ++++++++++++ + .../wireless/rtlwifi/btcoexist/halbtc8821a1ant.h | 188 + + .../wireless/rtlwifi/btcoexist/halbtc8821a2ant.c | 3879 ++++++++++++++++ + .../wireless/rtlwifi/btcoexist/halbtc8821a2ant.h | 205 + + .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c | 50 +- + .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h | 120 +- + drivers/net/wireless/rtlwifi/btcoexist/rtl_btc.c | 27 +- + drivers/net/wireless/rtlwifi/btcoexist/rtl_btc.h | 6 +- + drivers/net/wireless/rtlwifi/cam.c | 61 +- + drivers/net/wireless/rtlwifi/cam.h | 10 +- + drivers/net/wireless/rtlwifi/core.c | 888 +++- + drivers/net/wireless/rtlwifi/core.h | 11 +- + drivers/net/wireless/rtlwifi/debug.c | 10 +- + drivers/net/wireless/rtlwifi/debug.h | 11 +- + drivers/net/wireless/rtlwifi/efuse.c | 228 +- + drivers/net/wireless/rtlwifi/efuse.h | 17 +- + drivers/net/wireless/rtlwifi/pci.c | 859 ++-- + drivers/net/wireless/rtlwifi/pci.h | 56 +- + drivers/net/wireless/rtlwifi/ps.c | 283 +- + drivers/net/wireless/rtlwifi/ps.h | 71 +- + .../wireless/rtlwifi/{rtl8723ae => }/pwrseqcmd.h | 6 +- + drivers/net/wireless/rtlwifi/rc.c | 97 +- + drivers/net/wireless/rtlwifi/rc.h | 9 +- + drivers/net/wireless/rtlwifi/regd.c | 108 +- + drivers/net/wireless/rtlwifi/regd.h | 11 +- + drivers/net/wireless/rtlwifi/rtl8188ee/def.h | 66 +- + drivers/net/wireless/rtlwifi/rtl8188ee/dm.c | 881 ++-- + drivers/net/wireless/rtlwifi/rtl8188ee/dm.h | 23 +- + drivers/net/wireless/rtlwifi/rtl8188ee/fw.c | 259 +- + drivers/net/wireless/rtlwifi/rtl8188ee/fw.h | 29 +- + drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 1251 ++--- + drivers/net/wireless/rtlwifi/rtl8188ee/led.c | 49 +- + drivers/net/wireless/rtlwifi/rtl8188ee/led.h | 4 - + drivers/net/wireless/rtlwifi/rtl8188ee/phy.c | 2151 +++++---- + drivers/net/wireless/rtlwifi/rtl8188ee/phy.h | 49 +- + drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.c | 100 +- + drivers/net/wireless/rtlwifi/rtl8188ee/pwrseq.h | 415 +- + drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c | 139 - + drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h | 97 - + drivers/net/wireless/rtlwifi/rtl8188ee/reg.h | 2936 ++++++------ + drivers/net/wireless/rtlwifi/rtl8188ee/rf.c | 282 +- + drivers/net/wireless/rtlwifi/rtl8188ee/rf.h | 7 +- + drivers/net/wireless/rtlwifi/rtl8188ee/sw.c | 43 +- + drivers/net/wireless/rtlwifi/rtl8188ee/sw.h | 6 +- + drivers/net/wireless/rtlwifi/rtl8188ee/table.c | 6 +- + drivers/net/wireless/rtlwifi/rtl8188ee/table.h | 12 +- + drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 443 +- + drivers/net/wireless/rtlwifi/rtl8188ee/trx.h | 83 +- + drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 447 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h | 40 +- + drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 815 ++-- + drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 15 - + drivers/net/wireless/rtlwifi/rtl8192ce/dm.h | 64 - + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 16 +- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 3 + + drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 107 - + drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 5 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 8 +- + drivers/net/wireless/rtlwifi/rtl8192cu/def.h | 3 - + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 17 +- + drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 3 +- + drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 3 + + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 1 + + drivers/net/wireless/rtlwifi/rtl8192de/fw.h | 12 - + drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 8 +- + drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ee/Makefile | 19 + + drivers/net/wireless/rtlwifi/rtl8192ee/def.h | 101 + + drivers/net/wireless/rtlwifi/rtl8192ee/dm.c | 1263 +++++ + drivers/net/wireless/rtlwifi/rtl8192ee/dm.h | 267 ++ + drivers/net/wireless/rtlwifi/rtl8192ee/fw.c | 906 ++++ + drivers/net/wireless/rtlwifi/rtl8192ee/fw.h | 208 + + drivers/net/wireless/rtlwifi/rtl8192ee/hw.c | 2569 +++++++++++ + drivers/net/wireless/rtlwifi/rtl8192ee/hw.h | 62 + + drivers/net/wireless/rtlwifi/rtl8192ee/led.c | 145 + + drivers/net/wireless/rtlwifi/rtl8192ee/led.h | 34 + + drivers/net/wireless/rtlwifi/rtl8192ee/phy.c | 3219 +++++++++++++ + drivers/net/wireless/rtlwifi/rtl8192ee/phy.h | 153 + + drivers/net/wireless/rtlwifi/rtl8192ee/pwrseq.c | 112 + + drivers/net/wireless/rtlwifi/rtl8192ee/pwrseq.h | 340 ++ + drivers/net/wireless/rtlwifi/rtl8192ee/reg.h | 2231 +++++++++ + drivers/net/wireless/rtlwifi/rtl8192ee/rf.c | 152 + + drivers/net/wireless/rtlwifi/rtl8192ee/rf.h | 36 + + drivers/net/wireless/rtlwifi/rtl8192ee/sw.c | 399 ++ + drivers/net/wireless/rtlwifi/rtl8192ee/sw.h | 33 + + drivers/net/wireless/rtlwifi/rtl8192ee/table.c | 882 ++++ + drivers/net/wireless/rtlwifi/rtl8192ee/table.h | 45 + + drivers/net/wireless/rtlwifi/rtl8192ee/trx.c | 1293 ++++++ + drivers/net/wireless/rtlwifi/rtl8192ee/trx.h | 860 ++++ + drivers/net/wireless/rtlwifi/rtl8192se/fw.h | 1 - + drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 4 - + drivers/net/wireless/rtlwifi/rtl8723ae/btc.h | 7 +- + drivers/net/wireless/rtlwifi/rtl8723ae/def.h | 197 +- + drivers/net/wireless/rtlwifi/rtl8723ae/dm.c | 422 +- + drivers/net/wireless/rtlwifi/rtl8723ae/dm.h | 50 +- + drivers/net/wireless/rtlwifi/rtl8723ae/fw.c | 255 +- + drivers/net/wireless/rtlwifi/rtl8723ae/fw.h | 54 +- + .../wireless/rtlwifi/rtl8723ae/hal_bt_coexist.c | 414 +- + .../wireless/rtlwifi/rtl8723ae/hal_bt_coexist.h | 38 +- + drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.c | 1234 +++-- + drivers/net/wireless/rtlwifi/rtl8723ae/hal_btc.h | 66 +- + drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 1513 +++--- + drivers/net/wireless/rtlwifi/rtl8723ae/hw.h | 66 +- + drivers/net/wireless/rtlwifi/rtl8723ae/led.c | 54 +- + drivers/net/wireless/rtlwifi/rtl8723ae/led.h | 13 +- + drivers/net/wireless/rtlwifi/rtl8723ae/phy.c | 884 ++-- + drivers/net/wireless/rtlwifi/rtl8723ae/phy.h | 67 +- + drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.c | 93 +- + drivers/net/wireless/rtlwifi/rtl8723ae/pwrseq.h | 543 +-- + drivers/net/wireless/rtlwifi/rtl8723ae/pwrseqcmd.c | 129 - + drivers/net/wireless/rtlwifi/rtl8723ae/reg.h | 2718 +++++------ + drivers/net/wireless/rtlwifi/rtl8723ae/rf.c | 261 +- + drivers/net/wireless/rtlwifi/rtl8723ae/rf.h | 18 +- + drivers/net/wireless/rtlwifi/rtl8723ae/sw.c | 222 +- + drivers/net/wireless/rtlwifi/rtl8723ae/sw.h | 12 +- + drivers/net/wireless/rtlwifi/rtl8723ae/table.c | 8 +- + drivers/net/wireless/rtlwifi/rtl8723ae/table.h | 8 +- + drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 460 +- + drivers/net/wireless/rtlwifi/rtl8723ae/trx.h | 325 +- + drivers/net/wireless/rtlwifi/rtl8723be/def.h | 178 +- + drivers/net/wireless/rtlwifi/rtl8723be/dm.c | 243 +- + drivers/net/wireless/rtlwifi/rtl8723be/dm.h | 30 +- + drivers/net/wireless/rtlwifi/rtl8723be/fw.c | 194 +- + drivers/net/wireless/rtlwifi/rtl8723be/fw.h | 200 +- + drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 1320 +++--- + drivers/net/wireless/rtlwifi/rtl8723be/hw.h | 1 + + drivers/net/wireless/rtlwifi/rtl8723be/led.c | 6 +- + drivers/net/wireless/rtlwifi/rtl8723be/phy.c | 1783 ++++--- + drivers/net/wireless/rtlwifi/rtl8723be/phy.h | 110 +- + drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8723be/pwrseq.h | 131 +- + drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c | 139 - + drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.h | 95 - + drivers/net/wireless/rtlwifi/rtl8723be/reg.h | 1135 ++--- + drivers/net/wireless/rtlwifi/rtl8723be/rf.c | 144 +- + drivers/net/wireless/rtlwifi/rtl8723be/sw.c | 42 +- + drivers/net/wireless/rtlwifi/rtl8723be/table.c | 1053 ++--- + drivers/net/wireless/rtlwifi/rtl8723be/table.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8723be/trx.c | 314 +- + drivers/net/wireless/rtlwifi/rtl8723be/trx.h | 34 +- + .../net/wireless/rtlwifi/rtl8723com/dm_common.c | 14 +- + .../net/wireless/rtlwifi/rtl8723com/fw_common.c | 90 +- + .../net/wireless/rtlwifi/rtl8723com/fw_common.h | 59 +- + .../net/wireless/rtlwifi/rtl8723com/phy_common.c | 57 +- + drivers/net/wireless/rtlwifi/rtl8821ae/Makefile | 19 + + drivers/net/wireless/rtlwifi/rtl8821ae/def.h | 450 ++ + drivers/net/wireless/rtlwifi/rtl8821ae/dm.c | 3019 ++++++++++++ + drivers/net/wireless/rtlwifi/rtl8821ae/dm.h | 356 ++ + drivers/net/wireless/rtlwifi/rtl8821ae/fw.c | 1857 ++++++++ + drivers/net/wireless/rtlwifi/rtl8821ae/fw.h | 351 ++ + drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 4218 +++++++++++++++++ + drivers/net/wireless/rtlwifi/rtl8821ae/hw.h | 70 + + drivers/net/wireless/rtlwifi/rtl8821ae/led.c | 237 + + drivers/net/wireless/rtlwifi/rtl8821ae/led.h | 37 + + drivers/net/wireless/rtlwifi/rtl8821ae/phy.c | 4855 ++++++++++++++++++++ + drivers/net/wireless/rtlwifi/rtl8821ae/phy.h | 259 ++ + drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.c | 182 + + drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.h | 738 +++ + drivers/net/wireless/rtlwifi/rtl8821ae/reg.h | 2464 ++++++++++ + drivers/net/wireless/rtlwifi/rtl8821ae/rf.c | 465 ++ + drivers/net/wireless/rtlwifi/rtl8821ae/rf.h | 43 + + drivers/net/wireless/rtlwifi/rtl8821ae/sw.c | 484 ++ + drivers/net/wireless/rtlwifi/rtl8821ae/sw.h | 34 + + drivers/net/wireless/rtlwifi/rtl8821ae/table.c | 4572 ++++++++++++++++++ + drivers/net/wireless/rtlwifi/rtl8821ae/table.h | 60 + + drivers/net/wireless/rtlwifi/rtl8821ae/trx.c | 1236 +++++ + drivers/net/wireless/rtlwifi/rtl8821ae/trx.h | 620 +++ + drivers/net/wireless/rtlwifi/stats.c | 50 +- + drivers/net/wireless/rtlwifi/stats.h | 7 +- + drivers/net/wireless/rtlwifi/usb.c | 4 +- + drivers/net/wireless/rtlwifi/wifi.h | 253 +- + drivers/net/wireless/ti/wl1251/spi.c | 1 - + drivers/net/wireless/ti/wlcore/debug.h | 2 +- + drivers/net/wireless/ti/wlcore/spi.c | 20 +- + drivers/nfc/st21nfca/i2c.c | 34 +- + drivers/nfc/st21nfca/st21nfca.c | 59 +- + drivers/nfc/st21nfca/st21nfca.h | 21 - + drivers/nfc/st21nfca/st21nfca_dep.c | 59 +- + drivers/nfc/st21nfcb/i2c.c | 67 +- + drivers/nfc/st21nfcb/ndlc.c | 6 +- + drivers/nfc/st21nfcb/ndlc.h | 4 + + drivers/nfc/st21nfcb/st21nfcb.c | 27 +- + drivers/nfc/st21nfcb/st21nfcb.h | 2 - + drivers/nfc/trf7970a.c | 1059 ++++- + drivers/of/address.c | 154 + + drivers/of/of_mdio.c | 9 +- + drivers/of/of_pci.c | 142 + + drivers/pci/host/Kconfig | 28 + + drivers/pci/host/Makefile | 3 + + drivers/pci/host/pci-imx6.c | 13 +- + drivers/pci/host/pci-keystone-dw.c | 516 +++ + drivers/pci/host/pci-keystone.c | 415 ++ + drivers/pci/host/pci-keystone.h | 58 + + drivers/pci/host/pci-mvebu.c | 6 +- + drivers/pci/host/pci-tegra.c | 277 +- + drivers/pci/host/pci-xgene.c | 659 +++ + drivers/pci/host/pcie-designware.c | 268 +- + drivers/pci/host/pcie-designware.h | 22 +- + drivers/pci/host/pcie-rcar.c | 21 +- + drivers/pci/host/pcie-spear13xx.c | 2 +- + drivers/pci/host/pcie-xilinx.c | 970 ++++ + drivers/pci/hotplug/Makefile | 2 +- + drivers/pci/hotplug/acpi_pcihp.c | 254 +- + drivers/pci/hotplug/acpiphp_glue.c | 11 +- + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/cpci_hotplug_core.c | 13 +- + drivers/pci/hotplug/cpcihp_generic.c | 28 +- + drivers/pci/hotplug/cpcihp_zt5550.c | 44 +- + drivers/pci/hotplug/cpqphp.h | 2 +- + drivers/pci/hotplug/cpqphp_core.c | 3 +- + drivers/pci/hotplug/cpqphp_ctrl.c | 19 +- + drivers/pci/hotplug/cpqphp_nvram.c | 13 +- + drivers/pci/hotplug/ibmphp_core.c | 19 +- + drivers/pci/hotplug/ibmphp_ebda.c | 3 +- + drivers/pci/hotplug/ibmphp_hpc.c | 3 +- + drivers/pci/hotplug/ibmphp_pci.c | 6 +- + drivers/pci/hotplug/ibmphp_res.c | 45 +- + drivers/pci/hotplug/pciehp.h | 2 +- + drivers/pci/hotplug/pciehp_core.c | 7 + + drivers/pci/hotplug/pciehp_hpc.c | 17 +- + drivers/pci/hotplug/pciehp_pci.c | 9 +- + drivers/pci/hotplug/pcihp_slot.c | 176 - + drivers/pci/hotplug/shpchp_ctrl.c | 14 +- + drivers/pci/hotplug/shpchp_hpc.c | 5 +- + drivers/pci/hotplug/shpchp_pci.c | 8 +- + drivers/pci/iov.c | 2 +- + drivers/pci/msi.c | 75 +- + drivers/pci/pci-acpi.c | 276 +- + drivers/pci/pci-driver.c | 5 +- + drivers/pci/pci-sysfs.c | 41 +- + drivers/pci/pci.c | 57 +- + drivers/pci/pcie/aer/aerdrv_errprint.c | 11 +- + drivers/pci/pcie/portdrv_pci.c | 74 - + drivers/pci/probe.c | 167 +- + drivers/pci/quirks.c | 119 +- + drivers/pci/search.c | 34 - + drivers/pci/setup-bus.c | 2 +- + drivers/pinctrl/Kconfig | 2 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 16 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 8 +- + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 6 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 15 +- + drivers/pinctrl/sirf/pinctrl-sirf.c | 3 +- + drivers/platform/x86/intel_pmic_gpio.c | 3 +- + drivers/s390/net/qeth_l3_main.c | 2 +- + drivers/scsi/vmw_pvscsi.h | 1 - + drivers/ssb/driver_gpio.c | 3 +- + drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 5 +- + drivers/staging/vme/devices/vme_pio2_gpio.c | 4 +- + drivers/staging/wlan-ng/cfg80211.c | 1 + + drivers/tty/serial/max310x.c | 10 +- + drivers/tty/serial/sc16is7xx.c | 13 +- + drivers/usb/gadget/function/f_ncm.c | 8 + + drivers/usb/host/bcma-hcd.c | 2 +- + drivers/vfio/pci/vfio_pci_config.c | 2 +- + drivers/video/fbdev/via/via-gpio.c | 10 +- + drivers/virtio/virtio_ring.c | 186 +- + drivers/xen/xen-pciback/pci_stub.c | 4 +- + fs/timerfd.c | 3 +- + include/asm-generic/gpio.h | 2 +- + include/asm-generic/io.h | 2 +- + include/asm-generic/irq_work.h | 10 + + include/asm-generic/pgtable.h | 4 + + include/linux/aer.h | 2 + + include/linux/bcma/bcma.h | 6 +- + include/linux/bcma/bcma_driver_chipcommon.h | 8 + + include/linux/bcma/bcma_regs.h | 5 + + include/linux/bcma/bcma_soc.h | 1 + + include/linux/bpf.h | 136 + + include/linux/brcmphy.h | 137 +- + include/linux/com20020.h | 29 + + include/linux/cycx_x25.h | 125 - + include/linux/dynamic_queue_limits.h | 12 +- + include/linux/etherdevice.h | 1 + + include/linux/ethtool.h | 4 + + include/linux/filter.h | 196 +- + include/linux/fs_enet_pd.h | 1 - + include/linux/gpio/driver.h | 8 +- + include/linux/i82593.h | 229 - + include/linux/ieee80211.h | 73 +- + include/linux/if_macvlan.h | 1 + + include/linux/igmp.h | 1 + + include/linux/ioport.h | 5 + + include/linux/irq_work.h | 3 + + include/linux/irqchip/arm-gic.h | 16 + + include/linux/irqdesc.h | 19 + + include/linux/mlx4/device.h | 17 +- + include/linux/mlx5/device.h | 152 +- + include/linux/mlx5/driver.h | 118 +- + include/linux/mlx5/mlx5_ifc.h | 349 ++ + include/linux/mlx5/qp.h | 3 +- + include/linux/msi.h | 6 - + include/linux/netdevice.h | 248 +- + include/linux/netfilter/ipset/ip_set.h | 60 +- + include/linux/netfilter/ipset/ip_set_list.h | 1 + + include/linux/netfilter_bridge.h | 50 +- + include/linux/of_address.h | 27 +- + include/linux/of_pci.h | 13 + + include/linux/pci.h | 60 +- + include/linux/pci_hotplug.h | 2 - + include/linux/pci_ids.h | 2 + + include/linux/phonedev.h | 25 - + include/linux/phy.h | 27 + + include/linux/phy_fixed.h | 31 +- + include/linux/platform_data/gpio-dwapb.h | 32 + + include/linux/random.h | 4 +- + include/linux/rhashtable.h | 2 + + include/linux/rtnetlink.h | 10 + + include/linux/skbuff.h | 343 +- + include/linux/spi/mcp23s08.h | 18 + + include/linux/syscalls.h | 3 +- + include/linux/tcp.h | 2 +- + include/linux/tick.h | 2 - + include/linux/udp.h | 16 +- + include/net/addrconf.h | 2 +- + include/net/ah.h | 3 - + include/net/bluetooth/bluetooth.h | 5 +- + include/net/bluetooth/hci.h | 1 + + include/net/bluetooth/hci_core.h | 23 +- + include/net/bluetooth/l2cap.h | 35 +- + include/net/cfg80211.h | 69 +- + include/net/checksum.h | 4 +- + include/net/codel.h | 2 +- + include/net/dsa.h | 95 +- + include/net/flow_keys.h | 16 +- + include/net/gen_stats.h | 15 +- + include/net/geneve.h | 97 + + include/net/gue.h | 23 + + include/net/if_inet6.h | 1 - + include/net/inet_connection_sock.h | 9 + + include/net/inetpeer.h | 1 - + include/net/ip.h | 29 +- + include/net/ip6_checksum.h | 8 + + include/net/ip6_fib.h | 20 +- + include/net/ip_fib.h | 5 +- + include/net/ip_tunnels.h | 38 +- + include/net/ip_vs.h | 223 +- + include/net/ipv6.h | 4 +- + include/net/mac80211.h | 34 +- + include/net/mld.h | 5 +- + include/net/neighbour.h | 2 +- + include/net/netfilter/br_netfilter.h | 6 + + include/net/netfilter/ipv4/nf_nat_masquerade.h | 14 + + include/net/netfilter/ipv4/nf_reject.h | 119 +- + include/net/netfilter/ipv6/nf_nat_masquerade.h | 10 + + include/net/netfilter/ipv6/nf_reject.h | 2 +- + include/net/netfilter/nf_nat.h | 10 +- + include/net/netfilter/nf_nat_l3proto.h | 75 + + include/net/netfilter/nf_tables.h | 2 + + include/net/netfilter/nft_masq.h | 16 + + include/net/netfilter/nft_reject.h | 9 +- + include/net/netns/ipv4.h | 1 + + include/net/netns/ipv6.h | 2 +- + include/net/netns/xfrm.h | 14 + + include/net/nfc/nci.h | 16 +- + include/net/nfc/nci_core.h | 9 +- + include/net/pkt_cls.h | 18 +- + include/net/pkt_sched.h | 8 +- + include/net/sch_generic.h | 119 +- + include/net/sctp/command.h | 2 +- + include/net/snmp.h | 8 +- + include/net/sock.h | 16 +- + include/net/tcp.h | 85 +- + include/net/udp.h | 21 +- + include/net/udp_tunnel.h | 85 +- + include/net/xfrm.h | 1 + + include/ras/ras_event.h | 48 +- + include/rxrpc/types.h | 41 - + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/bpf.h | 155 + + include/uapi/linux/ethtool.h | 29 + + include/uapi/linux/fou.h | 39 + + include/uapi/linux/if_ether.h | 1 + + include/uapi/linux/if_link.h | 24 + + include/uapi/linux/if_tunnel.h | 17 + + include/uapi/linux/inet_diag.h | 13 +- + include/uapi/linux/ip_vs.h | 3 + + include/uapi/linux/netfilter/ipset/ip_set.h | 12 + + include/uapi/linux/netfilter/nf_nat.h | 5 + + include/uapi/linux/netfilter/nf_tables.h | 59 + + include/uapi/linux/netfilter/nfnetlink_acct.h | 8 + + include/uapi/linux/netfilter/xt_set.h | 10 + + include/uapi/linux/netfilter_arp/arpt_mangle.h | 2 +- + include/uapi/linux/nl80211.h | 116 +- + include/uapi/linux/openvswitch.h | 31 +- + include/uapi/linux/pci_regs.h | 3 +- + include/uapi/linux/wil6210_uapi.h | 87 + + include/uapi/linux/xfrm.h | 7 + + init/main.c | 1 - + kernel/bpf/Makefile | 6 +- + kernel/bpf/core.c | 127 +- + kernel/bpf/syscall.c | 606 +++ + kernel/bpf/test_stub.c | 116 + + kernel/bpf/verifier.c | 1923 ++++++++ + kernel/crash_dump.c | 1 + + kernel/irq/Kconfig | 3 + + kernel/irq/irqdesc.c | 42 + + kernel/irq_work.c | 15 +- + kernel/resource.c | 70 + + kernel/seccomp.c | 7 +- + kernel/sys_ni.c | 3 + + kernel/time/tick-common.c | 1 + + kernel/time/tick-internal.h | 7 + + kernel/time/tick-sched.c | 60 +- + kernel/time/timer.c | 2 +- + lib/Kconfig.debug | 3 +- + lib/random32.c | 39 +- + lib/rhashtable.c | 12 +- + lib/test_bpf.c | 63 +- + net/8021q/vlan_dev.c | 3 +- + net/Kconfig | 7 +- + net/atm/clip.c | 6 +- + net/atm/common.c | 2 +- + net/atm/mpc.c | 2 +- + net/bluetooth/6lowpan.c | 229 +- + net/bluetooth/af_bluetooth.c | 3 + + net/bluetooth/amp.c | 13 +- + net/bluetooth/hci_conn.c | 92 +- + net/bluetooth/hci_core.c | 122 +- + net/bluetooth/hci_event.c | 44 +- + net/bluetooth/hidp/core.c | 10 +- + net/bluetooth/l2cap_core.c | 406 +- + net/bluetooth/l2cap_sock.c | 23 +- + net/bluetooth/lib.c | 14 +- + net/bluetooth/mgmt.c | 161 +- + net/bluetooth/smp.c | 903 ++-- + net/bluetooth/smp.h | 20 +- + net/bridge/Makefile | 4 +- + net/bridge/br.c | 14 +- + net/bridge/br_device.c | 12 +- + net/bridge/br_forward.c | 2 + + net/bridge/br_if.c | 20 +- + net/bridge/br_input.c | 1 + + net/bridge/br_multicast.c | 2 +- + net/bridge/br_netfilter.c | 132 +- + net/bridge/br_netlink.c | 116 +- + net/bridge/br_nf_core.c | 96 + + net/bridge/br_private.h | 40 +- + net/bridge/br_stp.c | 15 +- + net/bridge/br_stp_if.c | 4 +- + net/bridge/br_stp_timer.c | 4 +- + net/bridge/br_sysfs_br.c | 21 +- + net/bridge/br_vlan.c | 147 +- + net/bridge/netfilter/ebtables.c | 15 + + net/bridge/netfilter/nf_tables_bridge.c | 2 + + net/bridge/netfilter/nft_reject_bridge.c | 95 +- + net/core/dev.c | 459 +- + net/core/dev_ioctl.c | 7 +- + net/core/ethtool.c | 82 + + net/core/filter.c | 45 +- + net/core/flow_dissector.c | 115 +- + net/core/gen_estimator.c | 29 +- + net/core/gen_stats.c | 112 +- + net/core/net_namespace.c | 2 +- + net/core/netpoll.c | 7 +- + net/core/pktgen.c | 76 +- + net/core/rtnetlink.c | 66 +- + net/core/secure_seq.c | 6 +- + net/core/skbuff.c | 395 +- + net/core/sock.c | 110 +- + net/core/timestamping.c | 43 +- + net/core/utils.c | 12 +- + net/dccp/ccid.c | 2 +- + net/dccp/ipv6.c | 2 +- + net/dccp/proto.c | 2 +- + net/decnet/af_decnet.c | 3 +- + net/decnet/dn_dev.c | 3 +- + net/decnet/dn_timer.c | 3 +- + net/dsa/Kconfig | 3 + + net/dsa/Makefile | 1 + + net/dsa/dsa.c | 186 +- + net/dsa/dsa_priv.h | 29 +- + net/dsa/slave.c | 304 +- + net/dsa/tag_brcm.c | 171 + + net/dsa/tag_dsa.c | 9 +- + net/dsa/tag_edsa.c | 9 +- + net/dsa/tag_trailer.c | 9 +- + net/ethernet/eth.c | 34 +- + net/ieee802154/6lowpan_rtnl.c | 127 +- + net/ieee802154/reassembly.c | 4 +- + net/ipv4/Kconfig | 51 +- + net/ipv4/Makefile | 3 + + net/ipv4/af_inet.c | 47 +- + net/ipv4/ah4.c | 2 - + net/ipv4/arp.c | 6 +- + net/ipv4/cipso_ipv4.c | 2 +- + net/ipv4/fib_frontend.c | 14 +- + net/ipv4/fib_semantics.c | 8 +- + net/ipv4/fou.c | 514 +++ + net/ipv4/geneve.c | 373 ++ + net/ipv4/gre_demux.c | 9 +- + net/ipv4/gre_offload.c | 55 +- + net/ipv4/icmp.c | 64 +- + net/ipv4/igmp.c | 35 +- + net/ipv4/inet_hashtables.c | 2 +- + net/ipv4/inetpeer.c | 21 - + net/ipv4/ip_fragment.c | 4 +- + net/ipv4/ip_gre.c | 94 +- + net/ipv4/ip_options.c | 6 +- + net/ipv4/ip_output.c | 10 +- + net/ipv4/ip_sockglue.c | 19 +- + net/ipv4/ip_tunnel.c | 106 +- + net/ipv4/ip_vti.c | 2 +- + net/ipv4/ipconfig.c | 3 +- + net/ipv4/ipip.c | 82 +- + net/ipv4/netfilter/Kconfig | 39 +- + net/ipv4/netfilter/Makefile | 5 + + net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- + net/ipv4/netfilter/ipt_MASQUERADE.c | 108 +- + net/ipv4/netfilter/ipt_REJECT.c | 2 +- + net/ipv4/netfilter/iptable_nat.c | 233 +- + net/ipv4/netfilter/nf_defrag_ipv4.c | 2 +- + net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 199 + + net/ipv4/netfilter/nf_nat_masquerade_ipv4.c | 153 + + net/ipv4/netfilter/nf_reject_ipv4.c | 127 + + net/ipv4/netfilter/nft_chain_nat_ipv4.c | 157 +- + net/ipv4/netfilter/nft_masq_ipv4.c | 77 + + net/ipv4/netfilter/nft_reject_ipv4.c | 1 - + net/ipv4/ping.c | 2 +- + net/ipv4/protocol.c | 1 + + net/ipv4/route.c | 14 +- + net/ipv4/syncookies.c | 2 +- + net/ipv4/sysctl_net_ipv4.c | 40 +- + net/ipv4/tcp.c | 36 +- + net/ipv4/tcp_bic.c | 11 +- + net/ipv4/tcp_cong.c | 55 +- + net/ipv4/tcp_cubic.c | 18 +- + net/ipv4/tcp_dctcp.c | 344 ++ + net/ipv4/tcp_diag.c | 5 +- + net/ipv4/tcp_fastopen.c | 2 +- + net/ipv4/tcp_highspeed.c | 145 +- + net/ipv4/tcp_htcp.c | 6 +- + net/ipv4/tcp_hybla.c | 1 - + net/ipv4/tcp_illinois.c | 3 +- + net/ipv4/tcp_input.c | 285 +- + net/ipv4/tcp_ipv4.c | 68 +- + net/ipv4/tcp_minisocks.c | 13 +- + net/ipv4/tcp_offload.c | 72 +- + net/ipv4/tcp_output.c | 124 +- + net/ipv4/tcp_probe.c | 6 +- + net/ipv4/tcp_scalable.c | 2 +- + net/ipv4/tcp_timer.c | 52 +- + net/ipv4/tcp_vegas.c | 3 - + net/ipv4/tcp_veno.c | 1 - + net/ipv4/tcp_westwood.c | 35 +- + net/ipv4/tcp_yeah.c | 9 +- + net/ipv4/udp.c | 13 +- + net/ipv4/udp_offload.c | 171 +- + net/ipv4/udp_tunnel.c | 138 +- + net/ipv6/Makefile | 4 + + net/ipv6/addrconf.c | 17 +- + net/ipv6/af_inet6.c | 20 +- + net/ipv6/ah6.c | 23 +- + net/ipv6/anycast.c | 108 +- + net/ipv6/datagram.c | 23 +- + net/ipv6/esp6.c | 15 +- + net/ipv6/exthdrs.c | 2 +- + net/ipv6/icmp.c | 34 +- + net/ipv6/inet6_connection_sock.c | 6 +- + net/ipv6/inet6_hashtables.c | 7 +- + net/ipv6/ip6_fib.c | 142 +- + net/ipv6/ip6_flowlabel.c | 19 +- + net/ipv6/ip6_gre.c | 14 +- + net/ipv6/ip6_icmp.c | 2 +- + net/ipv6/ip6_input.c | 6 +- + net/ipv6/ip6_offload.c | 34 +- + net/ipv6/ip6_output.c | 27 +- + net/ipv6/ip6_tunnel.c | 34 +- + net/ipv6/ip6_udp_tunnel.c | 107 + + net/ipv6/ip6_vti.c | 2 +- + net/ipv6/ip6mr.c | 4 +- + net/ipv6/ipcomp6.c | 6 +- + net/ipv6/ipv6_sockglue.c | 26 +- + net/ipv6/mcast.c | 302 +- + net/ipv6/mip6.c | 10 +- + net/ipv6/ndisc.c | 17 +- + net/ipv6/netfilter/Kconfig | 43 +- + net/ipv6/netfilter/Makefile | 5 + + net/ipv6/netfilter/ip6t_MASQUERADE.c | 76 +- + net/ipv6/netfilter/ip6table_nat.c | 233 +- + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 2 +- + net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 199 + + net/ipv6/netfilter/nf_nat_masquerade_ipv6.c | 120 + + net/ipv6/netfilter/nf_reject_ipv6.c | 163 + + net/ipv6/netfilter/nft_chain_nat_ipv6.c | 165 +- + net/ipv6/netfilter/nft_masq_ipv6.c | 77 + + net/ipv6/output_core.c | 2 +- + net/ipv6/proc.c | 2 +- + net/ipv6/protocol.c | 1 + + net/ipv6/raw.c | 8 +- + net/ipv6/reassembly.c | 12 +- + net/ipv6/route.c | 22 +- + net/ipv6/sit.c | 123 +- + net/ipv6/syncookies.c | 4 +- + net/ipv6/sysctl_net_ipv6.c | 10 + + net/ipv6/tcp_ipv6.c | 32 +- + net/ipv6/tcpv6_offload.c | 69 +- + net/ipv6/tunnel6.c | 4 +- + net/ipv6/udp.c | 26 +- + net/ipv6/udp_offload.c | 92 +- + net/ipv6/xfrm6_input.c | 6 +- + net/ipv6/xfrm6_output.c | 1 - + net/ipv6/xfrm6_policy.c | 22 +- + net/ipv6/xfrm6_state.c | 14 +- + net/ipv6/xfrm6_tunnel.c | 4 +- + net/irda/irlan/irlan_common.c | 4 +- + net/iucv/iucv.c | 9 +- + net/l2tp/l2tp_core.c | 24 +- + net/mac80211/agg-rx.c | 5 +- + net/mac80211/cfg.c | 114 +- + net/mac80211/chan.c | 191 +- + net/mac80211/debugfs.c | 6 +- + net/mac80211/debugfs_netdev.c | 4 +- + net/mac80211/debugfs_sta.c | 4 +- + net/mac80211/driver-ops.h | 2 +- + net/mac80211/ibss.c | 3 +- + net/mac80211/ieee80211_i.h | 9 +- + net/mac80211/iface.c | 15 +- + net/mac80211/key.c | 15 +- + net/mac80211/main.c | 1 + + net/mac80211/mesh_pathtbl.c | 4 +- + net/mac80211/mesh_plink.c | 14 +- + net/mac80211/mlme.c | 162 +- + net/mac80211/rc80211_minstrel.c | 98 +- + net/mac80211/rc80211_minstrel.h | 43 +- + net/mac80211/rc80211_minstrel_debugfs.c | 19 +- + net/mac80211/rc80211_minstrel_ht.c | 303 +- + net/mac80211/rc80211_minstrel_ht.h | 41 +- + net/mac80211/rc80211_minstrel_ht_debugfs.c | 10 +- + net/mac80211/rx.c | 13 +- + net/mac80211/scan.c | 3 +- + net/mac80211/sta_info.c | 5 +- + net/mac80211/sta_info.h | 9 +- + net/mac80211/status.c | 22 +- + net/mac80211/tdls.c | 7 +- + net/mac80211/trace.h | 4 +- + net/mac80211/tx.c | 32 +- + net/mac80211/util.c | 26 + + net/mac80211/wme.c | 5 +- + net/mac80211/wpa.c | 7 +- + net/mac802154/rx.c | 5 +- + net/mac802154/tx.c | 15 +- + net/mac802154/wpan.c | 10 +- + net/mpls/mpls_gso.c | 7 - + net/netfilter/Kconfig | 9 + + net/netfilter/Makefile | 1 + + net/netfilter/ipset/Kconfig | 9 + + net/netfilter/ipset/Makefile | 1 + + net/netfilter/ipset/ip_set_bitmap_gen.h | 4 + + net/netfilter/ipset/ip_set_bitmap_ip.c | 15 +- + net/netfilter/ipset/ip_set_bitmap_ipmac.c | 15 +- + net/netfilter/ipset/ip_set_bitmap_port.c | 15 +- + net/netfilter/ipset/ip_set_core.c | 53 +- + net/netfilter/ipset/ip_set_hash_gen.h | 30 +- + net/netfilter/ipset/ip_set_hash_ip.c | 22 +- + net/netfilter/ipset/ip_set_hash_ipmark.c | 14 +- + net/netfilter/ipset/ip_set_hash_ipport.c | 22 +- + net/netfilter/ipset/ip_set_hash_ipportip.c | 22 +- + net/netfilter/ipset/ip_set_hash_ipportnet.c | 14 +- + net/netfilter/ipset/ip_set_hash_mac.c | 173 + + net/netfilter/ipset/ip_set_hash_net.c | 16 +- + net/netfilter/ipset/ip_set_hash_netiface.c | 20 +- + net/netfilter/ipset/ip_set_hash_netnet.c | 29 +- + net/netfilter/ipset/ip_set_hash_netport.c | 16 +- + net/netfilter/ipset/ip_set_hash_netportnet.c | 22 +- + net/netfilter/ipset/ip_set_list_set.c | 23 +- + net/netfilter/ipvs/Kconfig | 10 + + net/netfilter/ipvs/Makefile | 1 + + net/netfilter/ipvs/ip_vs_conn.c | 74 +- + net/netfilter/ipvs/ip_vs_core.c | 15 +- + net/netfilter/ipvs/ip_vs_ctl.c | 223 +- + net/netfilter/ipvs/ip_vs_dh.c | 2 +- + net/netfilter/ipvs/ip_vs_fo.c | 79 + + net/netfilter/ipvs/ip_vs_ftp.c | 6 +- + net/netfilter/ipvs/ip_vs_lblc.c | 12 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 12 +- + net/netfilter/ipvs/ip_vs_lc.c | 2 +- + net/netfilter/ipvs/ip_vs_nq.c | 3 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 2 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 2 +- + net/netfilter/ipvs/ip_vs_rr.c | 2 +- + net/netfilter/ipvs/ip_vs_sed.c | 3 +- + net/netfilter/ipvs/ip_vs_sh.c | 8 +- + net/netfilter/ipvs/ip_vs_sync.c | 13 +- + net/netfilter/ipvs/ip_vs_wlc.c | 3 +- + net/netfilter/ipvs/ip_vs_wrr.c | 2 +- + net/netfilter/ipvs/ip_vs_xmit.c | 388 +- + net/netfilter/nf_conntrack_core.c | 4 +- + net/netfilter/nf_conntrack_expect.c | 3 +- + net/netfilter/nf_conntrack_netlink.c | 2 +- + net/netfilter/nf_conntrack_proto_generic.c | 26 +- + net/netfilter/nf_conntrack_standalone.c | 2 +- + net/netfilter/nf_log_common.c | 2 +- + net/netfilter/nf_nat_core.c | 5 +- + net/netfilter/nf_queue.c | 4 +- + net/netfilter/nf_tables_api.c | 601 ++- + net/netfilter/nfnetlink.c | 6 +- + net/netfilter/nfnetlink_acct.c | 54 + + net/netfilter/nfnetlink_log.c | 8 +- + net/netfilter/nfnetlink_queue_core.c | 12 +- + net/netfilter/nft_compat.c | 116 +- + net/netfilter/nft_masq.c | 59 + + net/netfilter/nft_meta.c | 45 + + net/netfilter/nft_nat.c | 16 + + net/netfilter/nft_reject.c | 37 + + net/netfilter/nft_reject_inet.c | 94 +- + net/netfilter/x_tables.c | 30 +- + net/netfilter/xt_HMARK.c | 2 +- + net/netfilter/xt_RATEEST.c | 2 +- + net/netfilter/xt_cluster.c | 3 +- + net/netfilter/xt_connbytes.c | 2 +- + net/netfilter/xt_hashlimit.c | 4 +- + net/netfilter/xt_physdev.c | 3 + + net/netfilter/xt_set.c | 191 +- + net/netfilter/xt_string.c | 1 - + net/netlabel/netlabel_user.c | 6 +- + net/nfc/digital_dep.c | 101 + + net/nfc/nci/core.c | 21 +- + net/nfc/nci/data.c | 7 +- + net/nfc/nci/ntf.c | 40 +- + net/openvswitch/Kconfig | 11 + + net/openvswitch/Makefile | 4 + + net/openvswitch/actions.c | 261 +- + net/openvswitch/datapath.c | 96 +- + net/openvswitch/datapath.h | 23 +- + net/openvswitch/flow.c | 123 +- + net/openvswitch/flow.h | 54 +- + net/openvswitch/flow_netlink.c | 292 +- + net/openvswitch/flow_netlink.h | 4 +- + net/openvswitch/vport-geneve.c | 235 + + net/openvswitch/vport-gre.c | 33 +- + net/openvswitch/vport-vxlan.c | 27 +- + net/openvswitch/vport.c | 45 +- + net/openvswitch/vport.h | 14 +- + net/packet/af_packet.c | 12 +- + net/phonet/pn_dev.c | 6 +- + net/rds/send.c | 11 +- + net/rds/tcp_connect.c | 5 +- + net/rds/threads.c | 3 +- + net/rose/rose_link.c | 3 +- + net/rxrpc/ar-error.c | 14 +- + net/rxrpc/ar-input.c | 9 +- + net/sched/act_api.c | 9 +- + net/sched/act_police.c | 6 +- + net/sched/cls_api.c | 33 +- + net/sched/cls_basic.c | 89 +- + net/sched/cls_bpf.c | 102 +- + net/sched/cls_cgroup.c | 79 +- + net/sched/cls_flow.c | 151 +- + net/sched/cls_fw.c | 120 +- + net/sched/cls_route.c | 241 +- + net/sched/cls_rsvp.h | 208 +- + net/sched/cls_tcindex.c | 273 +- + net/sched/cls_u32.c | 407 +- + net/sched/em_canid.c | 4 +- + net/sched/em_ipset.c | 7 +- + net/sched/em_meta.c | 4 +- + net/sched/em_nbyte.c | 2 +- + net/sched/em_text.c | 4 +- + net/sched/ematch.c | 15 +- + net/sched/sch_api.c | 65 +- + net/sched/sch_atm.c | 28 +- + net/sched/sch_cbq.c | 35 +- + net/sched/sch_choke.c | 29 +- + net/sched/sch_codel.c | 2 +- + net/sched/sch_drr.c | 27 +- + net/sched/sch_dsmark.c | 11 +- + net/sched/sch_fifo.c | 2 +- + net/sched/sch_fq.c | 14 +- + net/sched/sch_fq_codel.c | 24 +- + net/sched/sch_generic.c | 82 +- + net/sched/sch_gred.c | 4 +- + net/sched/sch_hfsc.c | 32 +- + net/sched/sch_hhf.c | 8 +- + net/sched/sch_htb.c | 48 +- + net/sched/sch_ingress.c | 10 +- + net/sched/sch_mq.c | 6 +- + net/sched/sch_mqprio.c | 20 +- + net/sched/sch_multiq.c | 17 +- + net/sched/sch_netem.c | 15 +- + net/sched/sch_pie.c | 2 +- + net/sched/sch_prio.c | 20 +- + net/sched/sch_qfq.c | 25 +- + net/sched/sch_red.c | 8 +- + net/sched/sch_sfb.c | 25 +- + net/sched/sch_sfq.c | 35 +- + net/sched/sch_tbf.c | 17 +- + net/sched/sch_teql.c | 20 +- + net/sctp/input.c | 8 +- + net/sctp/protocol.c | 2 +- + net/sctp/sm_statefuns.c | 19 +- + net/socket.c | 7 +- + net/tipc/Makefile | 2 +- + net/tipc/bcast.c | 20 +- + net/tipc/bcast.h | 2 +- + net/tipc/config.c | 4 +- + net/tipc/core.c | 9 +- + net/tipc/core.h | 6 +- + net/tipc/link.c | 120 +- + net/tipc/link.h | 7 +- + net/tipc/msg.c | 38 +- + net/tipc/msg.h | 5 + + net/tipc/name_distr.c | 140 +- + net/tipc/name_distr.h | 1 + + net/tipc/name_table.c | 9 +- + net/tipc/net.c | 3 +- + net/tipc/node.c | 95 + + net/tipc/node.h | 8 +- + net/tipc/port.c | 514 --- + net/tipc/port.h | 190 - + net/tipc/ref.c | 266 -- + net/tipc/ref.h | 48 - + net/tipc/socket.c | 884 +++- + net/tipc/socket.h | 55 +- + net/tipc/subscr.c | 1 - + net/tipc/sysctl.c | 7 + + net/unix/garbage.c | 2 +- + net/wimax/id-table.c | 2 +- + net/wimax/op-msg.c | 9 +- + net/wimax/op-reset.c | 3 +- + net/wimax/op-rfkill.c | 3 +- + net/wimax/op-state-get.c | 3 +- + net/wimax/stack.c | 7 +- + net/wimax/wimax-internal.h | 6 + + net/wireless/chan.c | 1 + + net/wireless/core.c | 16 +- + net/wireless/ibss.c | 4 +- + net/wireless/mlme.c | 8 +- + net/wireless/nl80211.c | 249 +- + net/wireless/nl80211.h | 3 +- + net/wireless/rdev-ops.h | 31 + + net/wireless/reg.c | 82 +- + net/wireless/scan.c | 22 +- + net/wireless/sme.c | 6 +- + net/wireless/trace.h | 45 + + net/wireless/util.c | 3 +- + net/wireless/wext-compat.c | 2 + + net/wireless/wext-sme.c | 2 +- + net/xfrm/xfrm_hash.h | 76 +- + net/xfrm/xfrm_output.c | 6 +- + net/xfrm/xfrm_policy.c | 144 +- + net/xfrm/xfrm_state.c | 13 +- + net/xfrm/xfrm_user.c | 83 +- + samples/bpf/Makefile | 12 + + samples/bpf/libbpf.c | 94 + + samples/bpf/libbpf.h | 172 + + samples/bpf/test_verifier.c | 678 +++ + sound/soc/codecs/wm5100.c | 5 +- + sound/soc/codecs/wm8903.c | 6 +- + sound/soc/codecs/wm8962.c | 5 +- + sound/soc/codecs/wm8996.c | 6 +- + virt/kvm/assigned-dev.c | 2 +- + virt/kvm/iommu.c | 4 +- + 1669 files changed, 161126 insertions(+), 40207 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/bcma.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-dsp-keystone.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-pca953x.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-xgene.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,keystone-irq.txt + create mode 100644 Documentation/devicetree/bindings/net/broadcom-mdio-unimac.txt + create mode 100644 Documentation/devicetree/bindings/net/broadcom-sf2.txt + create mode 100644 Documentation/devicetree/bindings/net/can/m_can.txt + create mode 100644 Documentation/devicetree/bindings/net/can/rcar_can.txt + create mode 100644 Documentation/devicetree/bindings/net/emac_rockchip.txt + create mode 100644 Documentation/devicetree/bindings/net/marvell-pxa168.txt + create mode 100644 Documentation/devicetree/bindings/net/meson-dwmac.txt + create mode 100644 Documentation/devicetree/bindings/net/qca-qca7000-spi.txt + create mode 100644 Documentation/devicetree/bindings/pci/pci-keystone.txt + create mode 100644 Documentation/devicetree/bindings/pci/xgene-pci.txt + create mode 100644 Documentation/devicetree/bindings/pci/xilinx-pcie.txt + create mode 100644 Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt + create mode 100644 Documentation/networking/dctcp.txt + create mode 100644 Documentation/networking/timestamping/txtimestamp.c + create mode 100644 arch/arm/include/asm/irq_work.h + create mode 100644 arch/arm64/include/asm/irq_work.h + create mode 100644 arch/arm64/include/asm/pci.h + create mode 100644 arch/arm64/kernel/pci.c + create mode 100644 arch/x86/include/asm/irq_work.h + create mode 100644 drivers/bcma/driver_chipcommon_b.c + create mode 100644 drivers/clocksource/meson6_timer.c + create mode 100644 drivers/gpio/gpio-xgene.c + create mode 100644 drivers/irqchip/irq-bcm7120-l2.c + create mode 100644 drivers/irqchip/irq-hip04.c + create mode 100644 drivers/irqchip/irq-keystone.c + create mode 100644 drivers/net/can/m_can/Kconfig + create mode 100644 drivers/net/can/m_can/Makefile + create mode 100644 drivers/net/can/m_can/m_can.c + create mode 100644 drivers/net/dsa/bcm_sf2.c + create mode 100644 drivers/net/dsa/bcm_sf2.h + create mode 100644 drivers/net/dsa/bcm_sf2_regs.h + create mode 100644 drivers/net/dsa/mv88e6171.c + create mode 100644 drivers/net/ethernet/agere/Kconfig + create mode 100644 drivers/net/ethernet/agere/Makefile + create mode 100644 drivers/net/ethernet/agere/et131x.c + create mode 100644 drivers/net/ethernet/agere/et131x.h + create mode 100644 drivers/net/ethernet/arc/emac_arc.c + create mode 100644 drivers/net/ethernet/arc/emac_rockchip.c + create mode 100644 drivers/net/ethernet/intel/fm10k/Makefile + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k.h + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_common.c + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_common.h + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_iov.c + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_main.c + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_mbx.c + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_mbx.h + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_netdev.c + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_pci.c + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_pf.c + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_pf.h + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_ptp.c + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_tlv.c + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_tlv.h + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_type.h + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_vf.c + create mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_vf.h + create mode 100644 drivers/net/ethernet/qualcomm/Kconfig + create mode 100644 drivers/net/ethernet/qualcomm/Makefile + create mode 100644 drivers/net/ethernet/qualcomm/qca_7k.c + create mode 100644 drivers/net/ethernet/qualcomm/qca_7k.h + create mode 100644 drivers/net/ethernet/qualcomm/qca_debug.c + create mode 100644 drivers/net/ethernet/qualcomm/qca_debug.h + create mode 100644 drivers/net/ethernet/qualcomm/qca_framing.c + create mode 100644 drivers/net/ethernet/qualcomm/qca_framing.h + create mode 100644 drivers/net/ethernet/qualcomm/qca_spi.c + create mode 100644 drivers/net/ethernet/qualcomm/qca_spi.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c + create mode 100644 drivers/net/phy/mdio-bcm-unimac.c + create mode 100644 drivers/net/wireless/ath/ath10k/spectral.c + create mode 100644 drivers/net/wireless/ath/ath10k/spectral.h + create mode 100644 drivers/net/wireless/ath/ath10k/testmode.c + create mode 100644 drivers/net/wireless/ath/ath10k/testmode.h + create mode 100644 drivers/net/wireless/ath/ath10k/testmode_i.h + delete mode 100644 drivers/net/wireless/ath/ath5k/ahb.c + create mode 100644 drivers/net/wireless/ath/ath9k/dynack.c + create mode 100644 drivers/net/wireless/ath/ath9k/dynack.h + create mode 100644 drivers/net/wireless/ath/spectral_common.h + create mode 100644 drivers/net/wireless/ath/trace.c + create mode 100644 drivers/net/wireless/ath/trace.h + create mode 100644 drivers/net/wireless/ath/wil6210/ethtool.c + create mode 100644 drivers/net/wireless/ath/wil6210/fw.c + create mode 100644 drivers/net/wireless/ath/wil6210/fw.h + create mode 100644 drivers/net/wireless/ath/wil6210/fw_inc.c + create mode 100644 drivers/net/wireless/ath/wil6210/ioctl.c + create mode 100644 drivers/net/wireless/ath/wil6210/wil_platform.c + create mode 100644 drivers/net/wireless/ath/wil6210/wil_platform.h + create mode 100644 drivers/net/wireless/ath/wil6210/wil_platform_msm.c + create mode 100644 drivers/net/wireless/ath/wil6210/wil_platform_msm.h + create mode 100644 drivers/net/wireless/b43/ppr.c + create mode 100644 drivers/net/wireless/b43/ppr.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-scd.h + create mode 100644 drivers/net/wireless/iwlwifi/mvm/tdls.c + create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8192e2ant.c + create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8192e2ant.h + create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b1ant.c + create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8723b1ant.h + create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a1ant.c + create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a1ant.h + create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a2ant.c + create mode 100644 drivers/net/wireless/rtlwifi/btcoexist/halbtc8821a2ant.h + rename drivers/net/wireless/rtlwifi/{rtl8723ae => }/pwrseqcmd.h (92%) + delete mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c + delete mode 100644 drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/Makefile + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/def.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/dm.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/dm.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/fw.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/fw.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/hw.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/hw.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/led.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/led.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/phy.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/phy.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/pwrseq.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/pwrseq.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/reg.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/rf.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/rf.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/sw.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/sw.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/table.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/table.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/trx.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192ee/trx.h + delete mode 100644 drivers/net/wireless/rtlwifi/rtl8723ae/pwrseqcmd.c + delete mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c + delete mode 100644 drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/Makefile + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/def.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/dm.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/dm.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/fw.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/fw.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/hw.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/hw.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/led.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/led.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/phy.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/phy.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/reg.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/rf.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/rf.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/sw.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/sw.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/table.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/table.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/trx.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8821ae/trx.h + create mode 100644 drivers/pci/host/pci-keystone-dw.c + create mode 100644 drivers/pci/host/pci-keystone.c + create mode 100644 drivers/pci/host/pci-keystone.h + create mode 100644 drivers/pci/host/pci-xgene.c + create mode 100644 drivers/pci/host/pcie-xilinx.c + delete mode 100644 drivers/pci/hotplug/pcihp_slot.c + create mode 100644 include/asm-generic/irq_work.h + create mode 100644 include/linux/bpf.h + delete mode 100644 include/linux/cycx_x25.h + delete mode 100644 include/linux/i82593.h + create mode 100644 include/linux/mlx5/mlx5_ifc.h + delete mode 100644 include/linux/phonedev.h + create mode 100644 include/linux/platform_data/gpio-dwapb.h + create mode 100644 include/net/geneve.h + create mode 100644 include/net/gue.h + create mode 100644 include/net/netfilter/br_netfilter.h + create mode 100644 include/net/netfilter/ipv4/nf_nat_masquerade.h + create mode 100644 include/net/netfilter/ipv6/nf_nat_masquerade.h + create mode 100644 include/net/netfilter/nft_masq.h + delete mode 100644 include/rxrpc/types.h + create mode 100644 include/uapi/linux/bpf.h + create mode 100644 include/uapi/linux/fou.h + create mode 100644 include/uapi/linux/wil6210_uapi.h + create mode 100644 kernel/bpf/syscall.c + create mode 100644 kernel/bpf/test_stub.c + create mode 100644 kernel/bpf/verifier.c + create mode 100644 net/bridge/br_nf_core.c + create mode 100644 net/dsa/tag_brcm.c + create mode 100644 net/ipv4/fou.c + create mode 100644 net/ipv4/geneve.c + create mode 100644 net/ipv4/netfilter/nf_nat_masquerade_ipv4.c + create mode 100644 net/ipv4/netfilter/nf_reject_ipv4.c + create mode 100644 net/ipv4/netfilter/nft_masq_ipv4.c + create mode 100644 net/ipv4/tcp_dctcp.c + create mode 100644 net/ipv6/ip6_udp_tunnel.c + create mode 100644 net/ipv6/netfilter/nf_nat_masquerade_ipv6.c + create mode 100644 net/ipv6/netfilter/nf_reject_ipv6.c + create mode 100644 net/ipv6/netfilter/nft_masq_ipv6.c + create mode 100644 net/netfilter/ipset/ip_set_hash_mac.c + create mode 100644 net/netfilter/ipvs/ip_vs_fo.c + create mode 100644 net/netfilter/nft_masq.c + create mode 100644 net/openvswitch/vport-geneve.c + delete mode 100644 net/tipc/port.c + delete mode 100644 net/tipc/port.h + delete mode 100644 net/tipc/ref.c + delete mode 100644 net/tipc/ref.h + create mode 100644 samples/bpf/Makefile + create mode 100644 samples/bpf/libbpf.c + create mode 100644 samples/bpf/libbpf.h + create mode 100644 samples/bpf/test_verifier.c +Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (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 (ad684dce87fa ARM: 8179/1: kprobes-test: Fix compile error "bad immediate value for offset") +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (24cae7934cf1 m68k: Reformat arch/m68k/mm/hwtest.c) +$ 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/for-linus (7d59deb50aaf powerpc: Wire up sys_seccomp(), sys_getrandom() and sys_memfd_create()) +$ git merge powerpc-merge-mpe/for-linus +Already up-to-date. +Merging sparc/master (1cef94c36bd4 sparc64: Increase size of boot string to 1024 bytes) +$ git merge sparc/master +Auto-merging drivers/net/ethernet/sun/sunvnet.c +Auto-merging arch/sparc/kernel/viohs.c +Auto-merging arch/sparc/kernel/ldc.c +Auto-merging arch/sparc/include/asm/vio.h +Merge made by the 'recursive' strategy. + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/dma-mapping.h | 6 +- + arch/sparc/include/asm/hypervisor.h | 11 + + arch/sparc/include/asm/irq_64.h | 7 +- + arch/sparc/include/asm/ldc.h | 5 +- + arch/sparc/include/asm/page_64.h | 33 +- + arch/sparc/include/asm/pgalloc_64.h | 28 +- + arch/sparc/include/asm/pgtable_64.h | 100 ++++-- + arch/sparc/include/asm/spitfire.h | 2 + + arch/sparc/include/asm/thread_info_64.h | 1 + + arch/sparc/include/asm/tsb.h | 87 +++-- + arch/sparc/include/asm/vio.h | 16 +- + arch/sparc/kernel/cpu.c | 12 + + arch/sparc/kernel/cpumap.c | 2 + + arch/sparc/kernel/ds.c | 4 +- + arch/sparc/kernel/head_64.S | 12 + + arch/sparc/kernel/hvapi.c | 1 + + arch/sparc/kernel/hvcalls.S | 16 + + arch/sparc/kernel/ioport.c | 5 +- + arch/sparc/kernel/irq_64.c | 507 ++++++++++++++++++--------- + arch/sparc/kernel/ktlb.S | 125 +------ + arch/sparc/kernel/ldc.c | 41 +-- + arch/sparc/kernel/leon_kernel.c | 31 +- + arch/sparc/kernel/pcr.c | 47 ++- + arch/sparc/kernel/perf_event.c | 3 +- + arch/sparc/kernel/setup_64.c | 26 +- + arch/sparc/kernel/smp_64.c | 7 + + arch/sparc/kernel/sun4v_tlb_miss.S | 35 +- + arch/sparc/kernel/traps_64.c | 15 +- + arch/sparc/kernel/vio.c | 13 +- + arch/sparc/kernel/viohs.c | 4 +- + arch/sparc/kernel/vmlinux.lds.S | 10 +- + arch/sparc/lib/memset.S | 18 +- + arch/sparc/mm/fault_64.c | 3 + + arch/sparc/mm/init_64.c | 603 +++++++++++++++++--------------- + arch/sparc/mm/init_64.h | 18 - + arch/sparc/power/hibernate_asm.S | 4 +- + arch/sparc/prom/bootstr_64.c | 5 +- + drivers/block/sunvdc.c | 167 +++++++-- + drivers/net/ethernet/sun/sunvnet.c | 4 +- + 40 files changed, 1244 insertions(+), 791 deletions(-) +Merging net/master (ea97caeee2ba Merge branch 'gianfar') +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/freescale/fsl_pq_mdio.c | 56 ++++++++++++++--------- + drivers/net/ethernet/freescale/gianfar.c | 68 +++++++++++++++------------- + drivers/net/ethernet/freescale/gianfar.h | 31 +++++++++++++ + net/netlabel/netlabel_kapi.c | 1 - + 4 files changed, 102 insertions(+), 54 deletions(-) +Merging ipsec/master (b8c203b2d2fc xfrm: Generate queueing routes only from route lookup functions) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (fd1a2a90d08b Merge tag 'asoc-v3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound-current/for-linus +Auto-merging sound/usb/midi.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/DocBook/writing-an-alsa-driver.tmpl | 28 +- + .../devicetree/bindings/sound/adi,ssm2602.txt | 19 + + .../devicetree/bindings/sound/cs35l32.txt | 62 + + Documentation/devicetree/bindings/sound/es8328.txt | 38 + + .../devicetree/bindings/sound/fsl,esai.txt | 3 +- + .../devicetree/bindings/sound/fsl,ssi.txt | 8 +- + .../devicetree/bindings/sound/fsl-asoc-card.txt | 82 ++ + .../devicetree/bindings/sound/fsl-sai.txt | 30 +- + .../devicetree/bindings/sound/imx-audio-es8328.txt | 60 + + .../bindings/sound/nvidia,tegra-audio-max98090.txt | 1 + + Documentation/devicetree/bindings/sound/rt5677.txt | 59 + + .../devicetree/bindings/sound/simple-card.txt | 4 + + .../devicetree/bindings/sound/ssm4567.txt | 15 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + include/dt-bindings/sound/cs35l32.h | 26 + + include/sound/pcm.h | 52 +- + include/sound/rt5645.h | 3 + + include/sound/rt5677.h | 13 +- + include/sound/soc-dapm.h | 5 +- + include/sound/soc.h | 101 +- + include/sound/vx_core.h | 7 +- + include/trace/events/asoc.h | 6 +- + include/uapi/sound/asound.h | 3 +- + sound/core/misc.c | 2 + + sound/core/pcm.c | 2 + + sound/core/pcm_lib.c | 10 +- + sound/core/pcm_misc.c | 4 + + sound/core/pcm_native.c | 136 +- + sound/drivers/vx/vx_core.c | 49 +- + sound/drivers/vx/vx_mixer.c | 12 +- + sound/drivers/vx/vx_pcm.c | 68 +- + sound/drivers/vx/vx_uer.c | 23 +- + sound/pci/au88x0/au88x0.c | 22 +- + sound/pci/au88x0/au88x0_a3d.c | 10 +- + sound/pci/au88x0/au88x0_core.c | 76 +- + sound/pci/au88x0/au88x0_eq.c | 2 +- + sound/pci/au88x0/au88x0_game.c | 2 +- + sound/pci/au88x0/au88x0_mpu401.c | 2 +- + sound/pci/au88x0/au88x0_pcm.c | 8 +- + sound/pci/au88x0/au88x0_synth.c | 26 +- + sound/pci/ctxfi/ctamixer.c | 12 +- + sound/pci/ctxfi/ctamixer.h | 7 +- + sound/pci/ctxfi/ctatc.c | 52 +- + sound/pci/ctxfi/ctatc.h | 2 +- + sound/pci/ctxfi/ctdaio.c | 42 +- + sound/pci/ctxfi/ctdaio.h | 8 +- + sound/pci/ctxfi/cthardware.h | 4 +- + sound/pci/ctxfi/cthw20k1.c | 22 +- + sound/pci/ctxfi/cthw20k2.c | 39 +- + sound/pci/ctxfi/ctmixer.c | 8 +- + sound/pci/ctxfi/ctpcm.c | 9 +- + sound/pci/ctxfi/ctresource.c | 55 +- + sound/pci/ctxfi/ctresource.h | 9 +- + sound/pci/ctxfi/ctsrc.c | 18 +- + sound/pci/ctxfi/ctsrc.h | 7 +- + sound/pci/ctxfi/ctvmem.c | 14 +- + sound/pci/ctxfi/xfi.c | 17 +- + sound/pci/hda/hda_auto_parser.c | 21 +- + sound/pci/hda/hda_auto_parser.h | 1 + + sound/pci/hda/hda_codec.c | 135 +- + sound/pci/hda/hda_codec.h | 2 - + sound/pci/hda/hda_generic.c | 49 +- + sound/pci/hda/hda_generic.h | 19 +- + sound/pci/hda/hda_jack.c | 83 +- + sound/pci/hda/hda_jack.h | 44 +- + sound/pci/hda/hda_local.h | 14 +- + sound/pci/hda/hda_sysfs.c | 2 +- + sound/pci/hda/patch_ca0132.c | 74 +- + sound/pci/hda/patch_cirrus.c | 5 +- + sound/pci/hda/patch_conexant.c | 12 +- + sound/pci/hda/patch_hdmi.c | 18 +- + sound/pci/hda/patch_realtek.c | 1356 +++++++++----------- + sound/pci/hda/patch_sigmatel.c | 91 +- + sound/pci/hda/patch_via.c | 30 +- + sound/pci/ice1712/ice1712.c | 2 +- + sound/pci/lx6464es/lx6464es.c | 43 +- + sound/pci/lx6464es/lx6464es.h | 9 +- + sound/pci/lx6464es/lx_core.c | 252 ++-- + sound/pci/lx6464es/lx_core.h | 4 +- + sound/pci/mixart/mixart.c | 17 +- + sound/pci/mixart/mixart.h | 10 +- + sound/pci/mixart/mixart_core.c | 79 +- + sound/pci/mixart/mixart_core.h | 2 +- + sound/pci/oxygen/oxygen_pcm.c | 10 + + sound/pci/oxygen/virtuoso.c | 1 + + sound/pci/oxygen/xonar_pcm179x.c | 166 ++- + sound/pci/pcxhr/pcxhr.c | 43 +- + sound/pci/pcxhr/pcxhr.h | 8 +- + sound/pci/pcxhr/pcxhr_core.c | 102 +- + sound/pci/pcxhr/pcxhr_core.h | 2 +- + sound/pci/vx222/vx222.c | 5 +- + sound/pcmcia/pdaudiocf/pdaudiocf.c | 13 +- + sound/pcmcia/pdaudiocf/pdaudiocf.h | 5 +- + sound/pcmcia/pdaudiocf/pdaudiocf_core.c | 8 +- + sound/pcmcia/pdaudiocf/pdaudiocf_irq.c | 23 +- + sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 5 +- + sound/pcmcia/vx/vxp_ops.c | 10 +- + sound/pcmcia/vx/vxpocket.c | 13 +- + sound/soc/codecs/88pm860x-codec.c | 5 +- + sound/soc/codecs/Kconfig | 36 +- + sound/soc/codecs/Makefile | 10 + + sound/soc/codecs/ab8500-codec.c | 73 +- + sound/soc/codecs/ac97.c | 15 - + sound/soc/codecs/adau1373.c | 21 - + sound/soc/codecs/adau1761.c | 2 +- + sound/soc/codecs/adau1781.c | 2 +- + sound/soc/codecs/adau17x1.c | 8 - + sound/soc/codecs/adau17x1.h | 1 - + sound/soc/codecs/adav80x.c | 23 +- + sound/soc/codecs/cs35l32.c | 631 +++++++++ + sound/soc/codecs/cs35l32.h | 93 ++ + sound/soc/codecs/cs4265.c | 1 + + sound/soc/codecs/cs42l52.c | 24 +- + sound/soc/codecs/cs42l56.c | 27 +- + sound/soc/codecs/cs42l73.c | 25 +- + sound/soc/codecs/da732x.c | 27 +- + sound/soc/codecs/es8328-i2c.c | 60 + + sound/soc/codecs/es8328-spi.c | 49 + + sound/soc/codecs/es8328.c | 756 +++++++++++ + sound/soc/codecs/es8328.h | 314 +++++ + sound/soc/codecs/jz4740.c | 30 +- + sound/soc/codecs/lm49453.c | 14 - + sound/soc/codecs/max98090.c | 146 ++- + sound/soc/codecs/max98090.h | 13 +- + sound/soc/codecs/mc13783.c | 16 +- + sound/soc/codecs/ml26124.c | 24 +- + sound/soc/codecs/rt286.c | 2 + + sound/soc/codecs/rt5640.c | 49 +- + sound/soc/codecs/rt5640.h | 3 + + sound/soc/codecs/rt5645.c | 99 ++ + sound/soc/codecs/rt5645.h | 5 + + sound/soc/codecs/rt5677.c | 327 ++++- + sound/soc/codecs/rt5677.h | 171 ++- + sound/soc/codecs/sgtl5000.c | 42 +- + sound/soc/codecs/ssm2518.c | 13 - + sound/soc/codecs/ssm2602-i2c.c | 9 + + sound/soc/codecs/ssm2602-spi.c | 7 + + sound/soc/codecs/ssm2602.c | 39 +- + sound/soc/codecs/ssm4567.c | 343 +++++ + sound/soc/codecs/tas2552.c | 70 +- + sound/soc/codecs/tlv320aic31xx.c | 107 +- + sound/soc/codecs/tlv320aic31xx.h | 3 +- + sound/soc/codecs/tlv320aic3x.c | 29 +- + sound/soc/codecs/wm8350.c | 2 +- + sound/soc/codecs/wm8741.c | 1 - + sound/soc/codecs/wm8753.c | 2 +- + sound/soc/codecs/wm8804.c | 19 - + sound/soc/codecs/wm8971.c | 2 +- + sound/soc/codecs/wm8994.c | 18 +- + sound/soc/codecs/wm8995.c | 19 - + sound/soc/davinci/Kconfig | 3 +- + sound/soc/davinci/davinci-mcasp.c | 79 +- + sound/soc/davinci/edma-pcm.c | 2 + + sound/soc/fsl/Kconfig | 26 + + sound/soc/fsl/Makefile | 4 + + sound/soc/fsl/fsl-asoc-card.c | 574 +++++++++ + sound/soc/fsl/fsl_asrc.c | 6 +- + sound/soc/fsl/fsl_esai.c | 19 +- + sound/soc/fsl/fsl_esai.h | 8 +- + sound/soc/fsl/fsl_sai.c | 58 +- + sound/soc/fsl/fsl_sai.h | 8 +- + sound/soc/fsl/fsl_spdif.c | 6 +- + sound/soc/fsl/fsl_ssi.c | 89 +- + sound/soc/fsl/imx-es8328.c | 233 ++++ + sound/soc/generic/simple-card.c | 229 +++- + sound/soc/intel/Makefile | 3 +- + sound/soc/intel/byt-max98090.c | 1 + + sound/soc/intel/byt-rt5640.c | 83 +- + sound/soc/intel/sst-atom-controls.c | 218 ++++ + sound/soc/intel/sst-atom-controls.h | 416 +++++- + sound/soc/intel/sst-haswell-pcm.c | 56 +- + sound/soc/intel/sst-mfld-platform-compress.c | 38 +- + sound/soc/intel/sst-mfld-platform-pcm.c | 106 +- + sound/soc/intel/sst-mfld-platform.h | 58 +- + sound/soc/omap/rx51.c | 2 +- + sound/soc/rockchip/Kconfig | 3 +- + sound/soc/rockchip/Makefile | 2 +- + sound/soc/rockchip/rockchip_i2s.c | 32 +- + sound/soc/samsung/idma.c | 4 +- + sound/soc/samsung/odroidx2_max98090.c | 4 +- + sound/soc/samsung/speyside.c | 6 +- + sound/soc/sh/fsi.c | 7 +- + sound/soc/sh/rcar/core.c | 6 +- + sound/soc/sh/siu_pcm.c | 4 +- + sound/soc/sirf/sirf-usp.c | 24 +- + sound/soc/soc-core.c | 673 +++++----- + sound/soc/soc-dapm.c | 51 +- + sound/soc/soc-generic-dmaengine-pcm.c | 4 +- + sound/soc/soc-io.c | 28 - + sound/soc/soc-pcm.c | 2 +- + sound/soc/tegra/tegra_max98090.c | 40 + + sound/soc/txx9/txx9aclc.c | 14 +- + sound/usb/caiaq/audio.c | 5 + + sound/usb/midi.c | 11 + + sound/usb/quirks.c | 16 + + 195 files changed, 8018 insertions(+), 3263 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/adi,ssm2602.txt + create mode 100644 Documentation/devicetree/bindings/sound/cs35l32.txt + create mode 100644 Documentation/devicetree/bindings/sound/es8328.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl-asoc-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-es8328.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt5677.txt + create mode 100644 Documentation/devicetree/bindings/sound/ssm4567.txt + create mode 100644 include/dt-bindings/sound/cs35l32.h + create mode 100644 sound/soc/codecs/cs35l32.c + create mode 100644 sound/soc/codecs/cs35l32.h + create mode 100644 sound/soc/codecs/es8328-i2c.c + create mode 100644 sound/soc/codecs/es8328-spi.c + create mode 100644 sound/soc/codecs/es8328.c + create mode 100644 sound/soc/codecs/es8328.h + create mode 100644 sound/soc/codecs/ssm4567.c + create mode 100644 sound/soc/fsl/fsl-asoc-card.c + create mode 100644 sound/soc/fsl/imx-es8328.c + create mode 100644 sound/soc/intel/sst-atom-controls.c +Merging pci-current/for-linus (7cbeb9f90db8 PCI: pciehp: Fix pcie_wait_cmd() timeout) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (f8adaf0ae978 brcmfmac: Fix off by one bug in brcmf_count_20mhz_channels()) +$ git merge wireless/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (9e82bf014195 Linux 3.17-rc5) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (9e82bf014195 Linux 3.17-rc5) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (0f33be009b89 Linux 3.17-rc6) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (0b93a4c838fa usb: dwc3: fix TRB completion when multiple TRBs are started) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (dee80ad12d2b USB: cp210x: add support for Seluxit USB dongle) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (80213c03c415 Merge tag 'pci-v3.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (9e82bf014195 Linux 3.17-rc5) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (447a8b858e4b Merge branch 'next' into for-linus) +$ 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 (be34c4ef693f crypto: sha - Handle unaligned input data in generic sha256 and sha512.) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (a53dae49b2fe ide: use module_platform_driver()) +$ 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 (e66c98c7a0ea of: Fix NULL dereference in selftest removal code) +$ git merge devicetree-current/devicetree/merge +Merge made by the 'recursive' strategy. + drivers/of/selftest.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 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 (ce6a144a0d01 selftests/memfd: Run test on all architectures) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/memfd/Makefile | 21 ----------------- + tools/testing/selftests/memfd/memfd_test.c | 36 ++++++++++++++---------------- + 2 files changed, 17 insertions(+), 40 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (bfe01a5ba249 Linux 3.17) +$ 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 (a3556087153d ARC: boot: cpu feature print enhancements) +$ git merge arc/for-next +Removing arch/arc/plat-arcfpga/include/plat/memmap.h +Removing arch/arc/plat-arcfpga/include/plat/irq.h +Merge made by the 'recursive' strategy. + arch/arc/Kconfig | 6 +- + arch/arc/Makefile | 17 +- + arch/arc/boot/dts/angel4.dts | 5 - + arch/arc/boot/dts/nsimosci.dts | 7 +- + arch/arc/configs/fpga_defconfig | 1 - + arch/arc/configs/fpga_noramfs_defconfig | 1 - + arch/arc/configs/nsimosci_defconfig | 1 - + arch/arc/include/asm/arcregs.h | 89 +++++---- + arch/arc/include/asm/atomic.h | 4 - + arch/arc/include/asm/bitops.h | 4 - + arch/arc/include/asm/bug.h | 7 +- + arch/arc/include/asm/cache.h | 2 +- + arch/arc/include/asm/current.h | 4 - + arch/arc/include/asm/entry.h | 45 ++--- + arch/arc/include/asm/irqflags.h | 4 - + arch/arc/include/asm/kgdb.h | 32 ++-- + arch/arc/include/asm/processor.h | 13 +- + arch/arc/include/asm/setup.h | 1 - + arch/arc/include/asm/smp.h | 10 +- + arch/arc/include/asm/string.h | 3 - + arch/arc/include/asm/syscalls.h | 4 - + arch/arc/include/asm/thread_info.h | 4 - + arch/arc/include/asm/unaligned.h | 2 +- + arch/arc/kernel/Makefile | 2 +- + arch/arc/kernel/disasm.c | 4 +- + arch/arc/kernel/head.S | 10 - + arch/arc/kernel/perf_event.c | 22 +-- + arch/arc/kernel/setup.c | 272 ++++++++++++++-------------- + arch/arc/kernel/smp.c | 2 +- + arch/arc/mm/cache_arc700.c | 14 +- + arch/arc/mm/tlb.c | 8 +- + arch/arc/plat-arcfpga/Kconfig | 13 +- + arch/arc/plat-arcfpga/include/plat/irq.h | 27 --- + arch/arc/plat-arcfpga/include/plat/memmap.h | 29 --- + arch/arc/plat-arcfpga/platform.c | 61 +------ + arch/arc/plat-arcfpga/smp.c | 3 +- + arch/arc/plat-tb10x/Kconfig | 1 - + arch/arc/plat-tb10x/tb10x.c | 13 -- + 38 files changed, 283 insertions(+), 464 deletions(-) + delete mode 100644 arch/arc/plat-arcfpga/include/plat/irq.h + delete mode 100644 arch/arc/plat-arcfpga/include/plat/memmap.h +Merging arm/for-next (d5d16892243e Merge branches 'fiq' (early part), 'fixes', 'l2c' (early part) and 'misc' into for-next) +$ git merge arm/for-next +Already up-to-date. +Merging arm-perf/for-next/perf (7d1311b93e58 Linux 3.17-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (e7c773b4dde3 Merge branches 'next/drivers', 'next/dt' and 'next/fixes-non-critical' into for-next) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 300 +++++++++++++++++++++++++++++++++ + 1 file changed, 300 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (8d4f3361e05c Merge branch 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Resolved 'arch/arm/boot/dts/berlin2q-marvell-dmp.dts' using previous resolution. +Auto-merging arch/arm/boot/dts/berlin2q.dtsi +Auto-merging arch/arm/boot/dts/berlin2q-marvell-dmp.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/berlin2q-marvell-dmp.dts +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 62b7cc19ec6e] Merge remote-tracking branch 'berlin/berlin/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/marvell,berlin.txt | 10 ++ + arch/arm/boot/dts/berlin2.dtsi | 1 + + arch/arm/boot/dts/berlin2cd.dtsi | 1 + + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 8 ++ + arch/arm/boot/dts/berlin2q.dtsi | 41 ++++++- + arch/arm/mach-berlin/Kconfig | 2 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-berlin.c | 131 +++++++++++++++++++++ + 8 files changed, 194 insertions(+), 1 deletion(-) + 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 (2b2244a3e7c3 ARM: dts: imx6: make gpt per clock can be from OSC) +$ git merge imx-mxs/for-next +Already up-to-date. +Merging ixp4xx/next (19f949f52599 Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging keystone/next (c9eaa447e77e Linux 3.15-rc1) +$ git merge keystone/next +Already up-to-date. +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 (65a3bb88bb33 Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + drivers/clk/mvebu/armada-370.c | 8 +++++ + drivers/clk/mvebu/armada-375.c | 4 +-- + drivers/clk/mvebu/common.c | 82 ++++++++++++++++++++++++++++++++++++++++++ + drivers/clk/mvebu/common.h | 7 ++++ + 4 files changed, 99 insertions(+), 2 deletions(-) +Merging renesas/next (cc38f02b87ef Merge branches 'heads/dt-for-v3.18' and 'heads/soc-for-v3.18' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r8a7740.dtsi | 14 ++++++++++---- + arch/arm/mach-shmobile/clock-r8a7740.c | 7 ++++++- + include/dt-bindings/clock/r8a7740-clock.h | 1 + + 3 files changed, 17 insertions(+), 5 deletions(-) +Merging samsung/for-next (a84aaa7556a5 ARM: cacheflush: Fix v7_exit_coherency_flush exynos build breakage on ARMv6) +$ git merge samsung/for-next +Resolved 'Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt' using previous resolution. +Auto-merging drivers/clk/mvebu/common.h +Auto-merging drivers/clk/mvebu/common.c +Removing arch/arm/mach-exynos/hotplug.c +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 44c3a1666c59] Merge remote-tracking branch 'samsung/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/firmware.txt | 28 +- + .../devicetree/bindings/clock/maxim,max77686.txt | 16 +- + .../devicetree/bindings/clock/maxim,max77802.txt | 44 + + .../bindings/clock/renesas,cpg-mstp-clocks.txt | 1 + + .../clock/renesas,rcar-gen2-cpg-clocks.txt | 1 + + arch/arm/boot/dts/Makefile | 1 + + 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 | 18 +- + 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-arndale-octa.dts | 4 + + arch/arm/boot/dts/exynos5420-peach-pit.dts | 15 +- + arch/arm/boot/dts/exynos5420.dtsi | 4 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 15 +- + arch/arm/boot/dts/s3c6410-mini6410.dts | 4 - + arch/arm/boot/dts/s3c64xx.dtsi | 1 - + arch/arm/configs/exynos_defconfig | 24 +- + arch/arm/include/asm/firmware.h | 10 +- + arch/arm/mach-exynos/Kconfig | 5 + + arch/arm/mach-exynos/Makefile | 9 +- + arch/arm/mach-exynos/common.h | 15 +- + arch/arm/mach-exynos/exynos.c | 7 +- + arch/arm/mach-exynos/firmware.c | 65 +- + arch/arm/mach-exynos/hotplug.c | 91 --- + arch/arm/mach-exynos/platsmp.c | 136 +++ + arch/arm/mach-exynos/pm.c | 310 +------ + arch/arm/mach-exynos/pmu.c | 1 + + arch/arm/mach-exynos/regs-pmu.h | 6 + + 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/mm/proc-macros.S | 2 +- + arch/arm/plat-samsung/Kconfig | 5 +- + arch/arm/plat-samsung/Makefile | 1 + + arch/arm/plat-samsung/pm-debug.c | 1 + + drivers/clk/Kconfig | 11 + + drivers/clk/Makefile | 2 + + drivers/clk/at91/clk-pll.c | 160 ++-- + drivers/clk/at91/clk-usb.c | 20 +- + drivers/clk/clk-fractional-divider.c | 2 +- + drivers/clk/clk-max-gen.c | 192 +++++ + drivers/clk/clk-max-gen.h | 32 + + drivers/clk/clk-max77686.c | 183 +---- + drivers/clk/clk-max77802.c | 98 +++ + drivers/clk/clk.c | 73 +- + drivers/clk/mvebu/common.c | 9 +- + drivers/clk/mvebu/common.h | 2 + + drivers/clk/mvebu/kirkwood.c | 102 ++- + drivers/clk/rockchip/clk-rk3188.c | 8 + + drivers/clk/rockchip/clk-rk3288.c | 8 + + drivers/clk/rockchip/clk.c | 73 +- + drivers/clk/rockchip/clk.h | 1 + + drivers/clk/shmobile/clk-rcar-gen2.c | 1 + + drivers/clk/zynq/clkc.c | 30 +- + drivers/clk/zynq/pll.c | 4 +- + drivers/cpufreq/kirkwood-cpufreq.c | 14 +- + include/dt-bindings/clock/maxim,max77686.h | 23 + + include/dt-bindings/clock/maxim,max77802.h | 22 + + include/linux/clk-private.h | 1 + + 67 files changed, 3394 insertions(+), 1675 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/maxim,max77802.txt + create mode 100644 arch/arm/boot/dts/exynos5250-spring.dts + delete mode 100644 arch/arm/mach-exynos/hotplug.c + create mode 100644 arch/arm/mach-exynos/suspend.c + create mode 100644 drivers/clk/clk-max-gen.c + create mode 100644 drivers/clk/clk-max-gen.h + create mode 100644 drivers/clk/clk-max77802.c + create mode 100644 include/dt-bindings/clock/maxim,max77686.h + create mode 100644 include/dt-bindings/clock/maxim,max77802.h +Merging sunxi/sunxi/for-next (429823087fec Merge branches 'sunxi/dt-for-3.18' and 'sunxi/drivers-for-3.18' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + drivers/clk/sunxi/clk-sunxi.c | 9 +++++++++ + 1 file changed, 9 insertions(+) +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 (cd065a010a97 CRISv10: Readd missing header) +$ git merge cris/for-next +Already up-to-date. +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 (24cae7934cf1 m68k: Reformat arch/m68k/mm/hwtest.c) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (e803d4bd3118 m68k: Fix typo 'COFNIG_MBAR') +$ git merge m68knommu/for-next +Removing arch/m68k/platform/Makefile +Auto-merging arch/m68k/coldfire/vectors.c +Auto-merging arch/m68k/coldfire/m54xx.c +Auto-merging arch/m68k/coldfire/m5407.c +Auto-merging arch/m68k/coldfire/m5307.c +Auto-merging arch/m68k/coldfire/m528x.c +Auto-merging arch/m68k/coldfire/m527x.c +Auto-merging arch/m68k/coldfire/m5272.c +Auto-merging arch/m68k/coldfire/m525x.c +Auto-merging arch/m68k/coldfire/m5249.c +Auto-merging arch/m68k/coldfire/m523x.c +Auto-merging arch/m68k/coldfire/m520x.c +Auto-merging arch/m68k/coldfire/m5206.c +Auto-merging arch/m68k/coldfire/intc-5272.c +Auto-merging arch/m68k/coldfire/entry.S +Auto-merging arch/m68k/68360/ints.c +Auto-merging arch/m68k/68360/head-rom.S +Auto-merging arch/m68k/68360/head-ram.S +Auto-merging arch/m68k/68360/entry.S +Auto-merging arch/m68k/68360/config.c +Auto-merging arch/m68k/68360/Makefile +Auto-merging arch/m68k/68000/entry.S +Merge made by the 'recursive' strategy. + arch/m68k/{platform => }/68000/Makefile | 0 + arch/m68k/{platform => }/68000/bootlogo-vz.h | 0 + arch/m68k/{platform => }/68000/bootlogo.h | 0 + arch/m68k/{platform => }/68000/entry.S | 2 +- + arch/m68k/{platform => }/68000/head.S | 0 + arch/m68k/{platform => }/68000/ints.c | 0 + arch/m68k/{platform => }/68000/m68328.c | 0 + arch/m68k/{platform => }/68000/m68EZ328.c | 0 + arch/m68k/{platform => }/68000/m68VZ328.c | 0 + arch/m68k/{platform => }/68000/romvec.S | 0 + arch/m68k/{platform => }/68000/timers.c | 0 + arch/m68k/{platform => }/68360/Makefile | 2 +- + arch/m68k/{platform => }/68360/commproc.c | 0 + arch/m68k/{platform => }/68360/config.c | 2 +- + arch/m68k/{platform => }/68360/entry.S | 2 +- + arch/m68k/{platform => }/68360/head-ram.S | 5 ++--- + arch/m68k/{platform => }/68360/head-rom.S | 5 ++--- + arch/m68k/{platform => }/68360/ints.c | 2 +- + arch/m68k/Makefile | 12 ++++++------ + arch/m68k/{platform => }/coldfire/Makefile | 0 + arch/m68k/{platform => }/coldfire/cache.c | 0 + arch/m68k/{platform => }/coldfire/clk.c | 0 + arch/m68k/{platform => }/coldfire/device.c | 0 + arch/m68k/{platform => }/coldfire/dma.c | 0 + arch/m68k/{platform => }/coldfire/dma_timer.c | 0 + arch/m68k/{platform => }/coldfire/entry.S | 2 +- + arch/m68k/{platform => }/coldfire/firebee.c | 0 + arch/m68k/{platform => }/coldfire/gpio.c | 0 + arch/m68k/{platform => }/coldfire/head.S | 0 + arch/m68k/{platform => }/coldfire/intc-2.c | 0 + arch/m68k/{platform => }/coldfire/intc-5249.c | 0 + arch/m68k/{platform => }/coldfire/intc-525x.c | 0 + arch/m68k/{platform => }/coldfire/intc-5272.c | 2 +- + arch/m68k/{platform => }/coldfire/intc-simr.c | 0 + arch/m68k/{platform => }/coldfire/intc.c | 0 + arch/m68k/{platform => }/coldfire/m5206.c | 2 +- + arch/m68k/{platform => }/coldfire/m520x.c | 2 +- + arch/m68k/{platform => }/coldfire/m523x.c | 2 +- + arch/m68k/{platform => }/coldfire/m5249.c | 2 +- + arch/m68k/{platform => }/coldfire/m525x.c | 2 +- + arch/m68k/{platform => }/coldfire/m5272.c | 2 +- + arch/m68k/{platform => }/coldfire/m527x.c | 4 ++-- + arch/m68k/{platform => }/coldfire/m528x.c | 2 +- + arch/m68k/{platform => }/coldfire/m5307.c | 2 +- + arch/m68k/{platform => }/coldfire/m53xx.c | 0 + arch/m68k/{platform => }/coldfire/m5407.c | 2 +- + arch/m68k/{platform => }/coldfire/m5441x.c | 0 + arch/m68k/{platform => }/coldfire/m54xx.c | 3 +-- + arch/m68k/{platform => }/coldfire/mcf8390.c | 0 + arch/m68k/{platform => }/coldfire/nettel.c | 0 + arch/m68k/{platform => }/coldfire/pci.c | 0 + arch/m68k/{platform => }/coldfire/pit.c | 0 + arch/m68k/{platform => }/coldfire/reset.c | 0 + arch/m68k/{platform => }/coldfire/sltimers.c | 0 + arch/m68k/{platform => }/coldfire/timers.c | 0 + arch/m68k/{platform => }/coldfire/vectors.c | 2 +- + arch/m68k/include/asm/io_no.h | 9 +++++++++ + arch/m68k/include/asm/m54xxpci.h | 2 +- + arch/m68k/platform/Makefile | 3 --- + 59 files changed, 40 insertions(+), 37 deletions(-) + rename arch/m68k/{platform => }/68000/Makefile (100%) + rename arch/m68k/{platform => }/68000/bootlogo-vz.h (100%) + rename arch/m68k/{platform => }/68000/bootlogo.h (100%) + rename arch/m68k/{platform => }/68000/entry.S (98%) + rename arch/m68k/{platform => }/68000/head.S (100%) + rename arch/m68k/{platform => }/68000/ints.c (100%) + rename arch/m68k/{platform => }/68000/m68328.c (100%) + rename arch/m68k/{platform => }/68000/m68EZ328.c (100%) + rename arch/m68k/{platform => }/68000/m68VZ328.c (100%) + rename arch/m68k/{platform => }/68000/romvec.S (100%) + rename arch/m68k/{platform => }/68000/timers.c (100%) + rename arch/m68k/{platform => }/68360/Makefile (81%) + rename arch/m68k/{platform => }/68360/commproc.c (100%) + rename arch/m68k/{platform => }/68360/config.c (98%) + rename arch/m68k/{platform => }/68360/entry.S (98%) + rename arch/m68k/{platform => }/68360/head-ram.S (99%) + rename arch/m68k/{platform => }/68360/head-rom.S (99%) + rename arch/m68k/{platform => }/68360/ints.c (98%) + rename arch/m68k/{platform => }/coldfire/Makefile (100%) + rename arch/m68k/{platform => }/coldfire/cache.c (100%) + rename arch/m68k/{platform => }/coldfire/clk.c (100%) + rename arch/m68k/{platform => }/coldfire/device.c (100%) + rename arch/m68k/{platform => }/coldfire/dma.c (100%) + rename arch/m68k/{platform => }/coldfire/dma_timer.c (100%) + rename arch/m68k/{platform => }/coldfire/entry.S (98%) + rename arch/m68k/{platform => }/coldfire/firebee.c (100%) + rename arch/m68k/{platform => }/coldfire/gpio.c (100%) + rename arch/m68k/{platform => }/coldfire/head.S (100%) + rename arch/m68k/{platform => }/coldfire/intc-2.c (100%) + rename arch/m68k/{platform => }/coldfire/intc-5249.c (100%) + rename arch/m68k/{platform => }/coldfire/intc-525x.c (100%) + rename arch/m68k/{platform => }/coldfire/intc-5272.c (99%) + rename arch/m68k/{platform => }/coldfire/intc-simr.c (100%) + rename arch/m68k/{platform => }/coldfire/intc.c (100%) + rename arch/m68k/{platform => }/coldfire/m5206.c (96%) + rename arch/m68k/{platform => }/coldfire/m520x.c (98%) + rename arch/m68k/{platform => }/coldfire/m523x.c (97%) + rename arch/m68k/{platform => }/coldfire/m5249.c (97%) + rename arch/m68k/{platform => }/coldfire/m525x.c (97%) + rename arch/m68k/{platform => }/coldfire/m5272.c (98%) + rename arch/m68k/{platform => }/coldfire/m527x.c (97%) + rename arch/m68k/{platform => }/coldfire/m528x.c (98%) + rename arch/m68k/{platform => }/coldfire/m5307.c (97%) + rename arch/m68k/{platform => }/coldfire/m53xx.c (100%) + rename arch/m68k/{platform => }/coldfire/m5407.c (95%) + rename arch/m68k/{platform => }/coldfire/m5441x.c (100%) + rename arch/m68k/{platform => }/coldfire/m54xx.c (97%) + rename arch/m68k/{platform => }/coldfire/mcf8390.c (100%) + rename arch/m68k/{platform => }/coldfire/nettel.c (100%) + rename arch/m68k/{platform => }/coldfire/pci.c (100%) + rename arch/m68k/{platform => }/coldfire/pit.c (100%) + rename arch/m68k/{platform => }/coldfire/reset.c (100%) + rename arch/m68k/{platform => }/coldfire/sltimers.c (100%) + rename arch/m68k/{platform => }/coldfire/timers.c (100%) + rename arch/m68k/{platform => }/coldfire/vectors.c (96%) + delete mode 100644 arch/m68k/platform/Makefile +Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (554336c714f4 microblaze: Use empty asm-generic/linkage.h) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/linkage.h | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) +Merging mips/mips-for-linux-next (31d6f57d3c65 MIPS: ralink: remove deprecated IRQF_DISABLED) +$ git merge mips/mips-for-linux-next +Resolved 'arch/arm64/include/asm/Kbuild' using previous resolution. +Auto-merging include/asm-generic/dma-contiguous.h +Removing arch/mips/ralink/dts/Makefile +Removing arch/mips/netlogic/dts/Makefile +Auto-merging arch/mips/net/bpf_jit.c +Removing arch/mips/lantiq/dts/Makefile +Auto-merging arch/mips/include/asm/Kbuild +Removing arch/mips/cavium-octeon/.gitignore +Removing arch/arm64/include/asm/dma-contiguous.h +Auto-merging arch/arm64/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/arm64/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 536ba33efd9b] Merge remote-tracking branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm64/include/asm/Kbuild | 1 + + arch/arm64/include/asm/dma-contiguous.h | 28 ------------ + arch/mips/Kconfig | 6 +++ + arch/mips/Makefile | 11 +++++ + arch/mips/alchemy/devboards/db1300.c | 47 ++++++++++++++++++- + arch/mips/alchemy/devboards/db1550.c | 9 ++-- + arch/mips/alchemy/devboards/platform.c | 3 ++ + arch/mips/boot/.gitignore | 1 + + arch/mips/boot/dts/Makefile | 20 ++++++++ + arch/mips/{lantiq => boot}/dts/danube.dtsi | 0 + arch/mips/{lantiq => boot}/dts/easy50712.dts | 0 + arch/mips/{ralink => boot}/dts/mt7620a.dtsi | 0 + arch/mips/{ralink => boot}/dts/mt7620a_eval.dts | 0 + .../{cavium-octeon => boot/dts}/octeon_3xxx.dts | 0 + .../{cavium-octeon => boot/dts}/octeon_68xx.dts | 0 + arch/mips/{ralink => boot}/dts/rt2880.dtsi | 0 + arch/mips/{ralink => boot}/dts/rt2880_eval.dts | 0 + arch/mips/{ralink => boot}/dts/rt3050.dtsi | 0 + arch/mips/{ralink => boot}/dts/rt3052_eval.dts | 0 + arch/mips/{ralink => boot}/dts/rt3883.dtsi | 0 + arch/mips/{ralink => boot}/dts/rt3883_eval.dts | 0 + arch/mips/{mti-sead3 => boot/dts}/sead3.dts | 0 + arch/mips/{netlogic => boot}/dts/xlp_evp.dts | 0 + arch/mips/{netlogic => boot}/dts/xlp_fvp.dts | 0 + arch/mips/{netlogic => boot}/dts/xlp_gvp.dts | 0 + arch/mips/{netlogic => boot}/dts/xlp_svp.dts | 0 + arch/mips/cavium-octeon/.gitignore | 2 - + arch/mips/cavium-octeon/Makefile | 10 ---- + arch/mips/configs/sead3_defconfig | 2 +- + arch/mips/configs/sead3micro_defconfig | 2 +- + arch/mips/include/asm/Kbuild | 1 + + arch/mips/include/asm/cpu-features.h | 10 ++++ + arch/mips/include/asm/cpu-info.h | 5 ++ + .../asm/mach-au1x00/cpu-feature-overrides.h | 12 +++++ + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 + + .../asm/mach-loongson/cpu-feature-overrides.h | 2 + + arch/mips/include/asm/pgtable-bits.h | 44 ++++++++++++------ + arch/mips/include/asm/pgtable.h | 10 ++++ + arch/mips/include/uapi/asm/swab.h | 18 ++++++-- + arch/mips/kernel/cpu-probe.c | 21 +++++++++ + arch/mips/kernel/setup.c | 9 ++++ + arch/mips/lantiq/Kconfig | 1 + + arch/mips/lantiq/Makefile | 2 - + arch/mips/lantiq/dts/Makefile | 1 - + arch/mips/lib/csum_partial.S | 10 +++- + arch/mips/mm/dma-default.c | 37 ++++++++++----- + arch/mips/mti-sead3/Makefile | 4 -- + arch/mips/net/bpf_jit.c | 53 ++++++++-------------- + arch/mips/netlogic/Kconfig | 4 ++ + arch/mips/netlogic/Makefile | 1 - + arch/mips/netlogic/dts/Makefile | 4 -- + arch/mips/ralink/Kconfig | 4 ++ + arch/mips/ralink/Makefile | 2 - + arch/mips/ralink/dts/Makefile | 4 -- + arch/mips/ralink/timer.c | 2 +- + arch/x86/include/asm/Kbuild | 1 + + .../asm => include/asm-generic}/dma-contiguous.h | 7 +-- + 57 files changed, 274 insertions(+), 138 deletions(-) + delete mode 100644 arch/arm64/include/asm/dma-contiguous.h + create mode 100644 arch/mips/boot/dts/Makefile + rename arch/mips/{lantiq => boot}/dts/danube.dtsi (100%) + rename arch/mips/{lantiq => boot}/dts/easy50712.dts (100%) + rename arch/mips/{ralink => boot}/dts/mt7620a.dtsi (100%) + rename arch/mips/{ralink => boot}/dts/mt7620a_eval.dts (100%) + rename arch/mips/{cavium-octeon => boot/dts}/octeon_3xxx.dts (100%) + rename arch/mips/{cavium-octeon => boot/dts}/octeon_68xx.dts (100%) + rename arch/mips/{ralink => boot}/dts/rt2880.dtsi (100%) + rename arch/mips/{ralink => boot}/dts/rt2880_eval.dts (100%) + rename arch/mips/{ralink => boot}/dts/rt3050.dtsi (100%) + rename arch/mips/{ralink => boot}/dts/rt3052_eval.dts (100%) + rename arch/mips/{ralink => boot}/dts/rt3883.dtsi (100%) + rename arch/mips/{ralink => boot}/dts/rt3883_eval.dts (100%) + rename arch/mips/{mti-sead3 => boot/dts}/sead3.dts (100%) + rename arch/mips/{netlogic => boot}/dts/xlp_evp.dts (100%) + rename arch/mips/{netlogic => boot}/dts/xlp_fvp.dts (100%) + rename arch/mips/{netlogic => boot}/dts/xlp_gvp.dts (100%) + rename arch/mips/{netlogic => boot}/dts/xlp_svp.dts (100%) + delete mode 100644 arch/mips/cavium-octeon/.gitignore + delete mode 100644 arch/mips/lantiq/dts/Makefile + delete mode 100644 arch/mips/netlogic/dts/Makefile + delete mode 100644 arch/mips/ralink/dts/Makefile + rename {arch/x86/include/asm => include/asm-generic}/dma-contiguous.h (57%) +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 (7575e4d56f6f Merge tag 'sound-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound) +$ 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 powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states) +$ git merge powernv-cpuidle/powernv-cpuidle +Already up-to-date. +Merging powerpc-mpe/next (d53ba6b3bba3 cxl: Fix afu_read() not doing finish_wait() on signal or non-blocking) +$ git merge powerpc-mpe/next +Auto-merging arch/powerpc/sysdev/fsl_msi.c +Auto-merging arch/powerpc/platforms/pseries/hotplug-memory.c +Auto-merging arch/powerpc/platforms/powernv/pci.c +Auto-merging arch/powerpc/platforms/powernv/opal.c +Auto-merging arch/powerpc/platforms/Kconfig.cputype +Auto-merging arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c +Auto-merging arch/powerpc/mm/copro_fault.c +Auto-merging arch/powerpc/include/asm/machdep.h +Auto-merging arch/powerpc/configs/ppc64_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../testing/sysfs-bus-event_source-devices-hv_24x7 | 6 +- + .../testing/sysfs-bus-event_source-devices-hv_gpci | 12 +- + Documentation/ABI/testing/sysfs-class-cxl | 129 +++ + Documentation/devicetree/bindings/pci/fsl,pci.txt | 27 + + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/powerpc/00-INDEX | 2 + + Documentation/powerpc/cxl.txt | 379 ++++++++ + MAINTAINERS | 12 + + arch/powerpc/Kconfig | 11 +- + arch/powerpc/Makefile | 1 + + arch/powerpc/boot/Makefile | 5 + + arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 4 +- + arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 +- + arch/powerpc/boot/dts/t1040rdb.dts | 48 + + arch/powerpc/boot/dts/t1042rdb.dts | 48 + + arch/powerpc/boot/dts/t1042rdb_pi.dts | 57 ++ + arch/powerpc/boot/dts/t104xrdb.dtsi | 156 +++ + arch/powerpc/configs/cell_defconfig | 1 + + arch/powerpc/configs/celleb_defconfig | 1 + + arch/powerpc/configs/corenet32_smp_defconfig | 2 + + arch/powerpc/configs/corenet64_smp_defconfig | 46 +- + arch/powerpc/configs/g5_defconfig | 1 + + arch/powerpc/configs/maple_defconfig | 1 + + arch/powerpc/configs/mpc85xx_defconfig | 4 +- + arch/powerpc/configs/mpc85xx_smp_defconfig | 4 +- + arch/powerpc/configs/mpc86xx_defconfig | 3 + + arch/powerpc/configs/pasemi_defconfig | 1 + + arch/powerpc/configs/ppc64_defconfig | 1 + + arch/powerpc/include/asm/bug.h | 1 - + arch/powerpc/include/asm/copro.h | 29 + + arch/powerpc/include/asm/dma-mapping.h | 1 + + arch/powerpc/include/asm/eeh.h | 39 +- + arch/powerpc/include/asm/hydra.h | 1 - + arch/powerpc/include/asm/irq.h | 5 - + arch/powerpc/include/asm/kexec.h | 1 - + arch/powerpc/include/asm/machdep.h | 2 - + arch/powerpc/include/asm/mmu-hash64.h | 10 + + arch/powerpc/include/asm/opal.h | 45 +- + arch/powerpc/include/asm/page_64.h | 43 +- + arch/powerpc/include/asm/pgtable-ppc32.h | 6 +- + arch/powerpc/include/asm/pgtable-ppc64-4k.h | 2 +- + arch/powerpc/include/asm/pgtable-ppc64.h | 6 +- + arch/powerpc/include/asm/pgtable.h | 3 + + arch/powerpc/include/asm/plpar_wrappers.h | 12 +- + arch/powerpc/include/asm/pnv-pci.h | 31 + + arch/powerpc/include/asm/prom.h | 2 - + arch/powerpc/include/asm/reg.h | 3 +- + arch/powerpc/include/asm/rio.h | 1 - + arch/powerpc/include/asm/spu.h | 5 +- + arch/powerpc/include/asm/sstep.h | 62 ++ + arch/powerpc/include/asm/tsi108.h | 4 - + arch/powerpc/include/asm/udbg.h | 1 - + arch/powerpc/include/asm/word-at-a-time.h | 112 ++- + arch/powerpc/include/asm/xics.h | 1 + + arch/powerpc/kernel/Makefile | 3 + + arch/powerpc/kernel/crash_dump.c | 1 + + arch/powerpc/kernel/dma-swiotlb.c | 8 +- + arch/powerpc/kernel/dma.c | 47 +- + arch/powerpc/kernel/eeh.c | 269 ++++-- + arch/powerpc/kernel/eeh_driver.c | 106 ++- + arch/powerpc/kernel/eeh_pe.c | 23 +- + arch/powerpc/kernel/eeh_sysfs.c | 41 +- + arch/powerpc/kernel/head_8xx.S | 150 ++- + arch/powerpc/kernel/hw_breakpoint.c | 2 +- + arch/powerpc/kernel/ibmebus.c | 2 +- + arch/powerpc/kernel/idle_power7.S | 2 +- + arch/powerpc/kernel/irq.c | 6 +- + arch/powerpc/kernel/legacy_serial.c | 2 +- + arch/powerpc/kernel/module_32.c | 31 +- + arch/powerpc/kernel/module_64.c | 36 +- + arch/powerpc/kernel/nvram_64.c | 2 +- + arch/powerpc/kernel/of_platform.c | 2 +- + arch/powerpc/kernel/pci-common.c | 3 +- + arch/powerpc/kernel/pci_of_scan.c | 2 +- + arch/powerpc/kernel/ppc_ksyms.c | 192 +--- + arch/powerpc/kernel/ppc_ksyms_32.c | 61 ++ + arch/powerpc/kernel/process.c | 2 + + arch/powerpc/kernel/prom.c | 13 +- + arch/powerpc/kernel/prom_init_check.sh | 22 +- + arch/powerpc/kernel/ptrace.c | 2 +- + arch/powerpc/kernel/rtasd.c | 2 +- + arch/powerpc/kernel/setup-common.c | 7 +- + arch/powerpc/kernel/setup_32.c | 2 +- + arch/powerpc/kernel/setup_64.c | 32 +- + arch/powerpc/kernel/smp.c | 11 +- + arch/powerpc/kernel/time.c | 5 +- + arch/powerpc/lib/Makefile | 2 +- + arch/powerpc/lib/feature-fixups.c | 2 +- + arch/powerpc/lib/ppc_ksyms.c | 39 + + arch/powerpc/lib/sstep.c | 996 ++++++++++++------- + arch/powerpc/mm/Makefile | 1 + + .../cell/spu_fault.c => mm/copro_fault.c} | 69 +- + arch/powerpc/mm/fault.c | 43 +- + arch/powerpc/mm/hash_native_64.c | 6 +- + arch/powerpc/mm/hash_utils_64.c | 160 ++-- + arch/powerpc/mm/init_32.c | 4 +- + arch/powerpc/mm/init_64.c | 3 - + arch/powerpc/mm/mem.c | 68 +- + arch/powerpc/mm/numa.c | 27 +- + arch/powerpc/mm/pgtable.c | 2 +- + arch/powerpc/mm/slb.c | 3 - + arch/powerpc/mm/slice.c | 12 +- + arch/powerpc/oprofile/backtrace.c | 1 + + arch/powerpc/perf/core-book3s.c | 18 +- + arch/powerpc/perf/hv-24x7.c | 156 +-- + arch/powerpc/platforms/40x/ep405.c | 2 +- + arch/powerpc/platforms/40x/ppc40x_simple.c | 2 +- + arch/powerpc/platforms/40x/virtex.c | 2 +- + arch/powerpc/platforms/40x/walnut.c | 2 +- + arch/powerpc/platforms/44x/Kconfig | 6 +- + arch/powerpc/platforms/44x/canyonlands.c | 2 +- + arch/powerpc/platforms/44x/ebony.c | 2 +- + arch/powerpc/platforms/44x/iss4xx.c | 2 +- + arch/powerpc/platforms/44x/ppc44x_simple.c | 2 +- + arch/powerpc/platforms/44x/ppc476.c | 2 +- + arch/powerpc/platforms/44x/sam440ep.c | 2 +- + arch/powerpc/platforms/44x/virtex.c | 2 +- + arch/powerpc/platforms/44x/warp.c | 2 +- + arch/powerpc/platforms/512x/mpc512x_shared.c | 2 +- + arch/powerpc/platforms/52xx/lite5200.c | 4 +- + arch/powerpc/platforms/52xx/media5200.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_common.c | 12 +- + arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_pic.c | 4 +- + arch/powerpc/platforms/82xx/ep8248e.c | 2 +- + arch/powerpc/platforms/82xx/km82xx.c | 2 +- + arch/powerpc/platforms/82xx/mpc8272_ads.c | 2 +- + arch/powerpc/platforms/82xx/pq2fads.c | 2 +- + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 2 +- + arch/powerpc/platforms/83xx/misc.c | 2 +- + arch/powerpc/platforms/83xx/mpc834x_itx.c | 2 +- + arch/powerpc/platforms/83xx/suspend.c | 4 +- + arch/powerpc/platforms/85xx/Kconfig | 2 +- + arch/powerpc/platforms/85xx/common.c | 2 +- + arch/powerpc/platforms/85xx/corenet_generic.c | 14 + + arch/powerpc/platforms/85xx/ppa8548.c | 2 +- + arch/powerpc/platforms/85xx/qemu_e500.c | 10 + + arch/powerpc/platforms/85xx/sgy_cts1000.c | 4 +- + arch/powerpc/platforms/86xx/gef_ppc9a.c | 2 +- + arch/powerpc/platforms/86xx/gef_sbc310.c | 2 +- + arch/powerpc/platforms/86xx/gef_sbc610.c | 2 +- + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 +- + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 2 +- + arch/powerpc/platforms/86xx/sbc8641d.c | 2 +- + arch/powerpc/platforms/8xx/adder875.c | 2 +- + arch/powerpc/platforms/8xx/ep88xc.c | 2 +- + arch/powerpc/platforms/8xx/mpc86xads_setup.c | 2 +- + arch/powerpc/platforms/8xx/mpc885ads_setup.c | 2 +- + arch/powerpc/platforms/8xx/tqm8xx_setup.c | 2 +- + arch/powerpc/platforms/Kconfig.cputype | 6 + + arch/powerpc/platforms/cell/Kconfig | 1 + + arch/powerpc/platforms/cell/Makefile | 2 +- + arch/powerpc/platforms/cell/celleb_pci.c | 2 +- + arch/powerpc/platforms/cell/celleb_setup.c | 2 +- + arch/powerpc/platforms/cell/spu_base.c | 55 +- + arch/powerpc/platforms/cell/spufs/fault.c | 4 +- + arch/powerpc/platforms/chrp/setup.c | 2 +- + arch/powerpc/platforms/embedded6xx/gamecube.c | 2 +- + arch/powerpc/platforms/embedded6xx/linkstation.c | 2 +- + arch/powerpc/platforms/embedded6xx/mvme5100.c | 2 +- + arch/powerpc/platforms/embedded6xx/storcenter.c | 2 +- + arch/powerpc/platforms/embedded6xx/wii.c | 2 +- + arch/powerpc/platforms/pasemi/gpio_mdio.c | 2 +- + arch/powerpc/platforms/pasemi/setup.c | 2 +- + arch/powerpc/platforms/powermac/setup.c | 8 +- + arch/powerpc/platforms/powernv/eeh-ioda.c | 226 ++++- + arch/powerpc/platforms/powernv/eeh-powernv.c | 26 + + arch/powerpc/platforms/powernv/opal-dump.c | 18 +- + arch/powerpc/platforms/powernv/opal-elog.c | 4 + + arch/powerpc/platforms/powernv/opal-lpc.c | 4 +- + arch/powerpc/platforms/powernv/opal-nvram.c | 2 +- + arch/powerpc/platforms/powernv/opal-rtc.c | 15 +- + arch/powerpc/platforms/powernv/opal-tracepoints.c | 2 +- + arch/powerpc/platforms/powernv/opal-wrappers.S | 3 + + arch/powerpc/platforms/powernv/opal.c | 6 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 290 ++++-- + arch/powerpc/platforms/powernv/pci.c | 11 + + arch/powerpc/platforms/powernv/pci.h | 4 + + arch/powerpc/platforms/powernv/powernv.h | 6 + + arch/powerpc/platforms/powernv/setup.c | 11 +- + arch/powerpc/platforms/powernv/smp.c | 8 +- + arch/powerpc/platforms/powernv/subcore.c | 1 + + arch/powerpc/platforms/pseries/cmm.c | 1 - + arch/powerpc/platforms/pseries/dlpar.c | 29 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 40 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 10 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 1 + + arch/powerpc/platforms/pseries/iommu.c | 51 +- + arch/powerpc/platforms/pseries/lpar.c | 4 +- + arch/powerpc/platforms/pseries/nvram.c | 12 +- + arch/powerpc/platforms/pseries/pci.c | 1 + + arch/powerpc/platforms/pseries/ras.c | 2 +- + arch/powerpc/platforms/pseries/setup.c | 2 +- + arch/powerpc/sysdev/axonram.c | 2 +- + arch/powerpc/sysdev/dcr.c | 1 + + arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 2 +- + arch/powerpc/sysdev/fsl_msi.c | 95 +- + arch/powerpc/sysdev/fsl_msi.h | 4 +- + arch/powerpc/sysdev/fsl_pci.c | 3 +- + arch/powerpc/sysdev/mpic.c | 2 +- + arch/powerpc/sysdev/msi_bitmap.c | 42 +- + arch/powerpc/sysdev/mv64x60_dev.c | 2 +- + arch/powerpc/sysdev/pmi.c | 2 +- + arch/powerpc/sysdev/xics/icp-native.c | 25 + + arch/powerpc/sysdev/xilinx_intc.c | 2 +- + arch/powerpc/sysdev/xilinx_pci.c | 2 +- + drivers/cpufreq/pmac32-cpufreq.c | 2 +- + drivers/macintosh/adb.c | 5 + + drivers/macintosh/via-cuda.c | 2 + + drivers/misc/Kconfig | 1 + + drivers/misc/Makefile | 1 + + drivers/misc/cxl/Kconfig | 25 + + drivers/misc/cxl/Makefile | 3 + + drivers/misc/cxl/base.c | 86 ++ + drivers/misc/cxl/context.c | 193 ++++ + drivers/misc/cxl/cxl.h | 629 ++++++++++++ + drivers/misc/cxl/debugfs.c | 132 +++ + drivers/misc/cxl/fault.c | 291 ++++++ + drivers/misc/cxl/file.c | 518 ++++++++++ + drivers/misc/cxl/irq.c | 402 ++++++++ + drivers/misc/cxl/main.c | 230 +++++ + drivers/misc/cxl/native.c | 683 +++++++++++++ + drivers/misc/cxl/pci.c | 1000 ++++++++++++++++++++ + drivers/misc/cxl/sysfs.c | 385 ++++++++ + drivers/tty/hvc/hvc_vio.c | 2 +- + include/linux/fsl_ifc.h | 6 +- + include/misc/cxl.h | 48 + + include/uapi/Kbuild | 1 + + include/uapi/misc/Kbuild | 2 + + include/uapi/misc/cxl.h | 88 ++ + tools/testing/selftests/powerpc/Makefile | 2 +- + .../testing/selftests/powerpc/primitives/Makefile | 17 + + .../selftests/powerpc/primitives/asm/asm-compat.h | 1 + + .../selftests/powerpc/primitives/asm/ppc-opcode.h | 0 + .../powerpc/primitives/load_unaligned_zeropad.c | 147 +++ + .../selftests/powerpc/primitives/word-at-a-time.h | 1 + + 236 files changed, 8633 insertions(+), 1566 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-cxl + create mode 100644 Documentation/devicetree/bindings/pci/fsl,pci.txt + create mode 100644 Documentation/powerpc/cxl.txt + create mode 100644 arch/powerpc/boot/dts/t1040rdb.dts + create mode 100644 arch/powerpc/boot/dts/t1042rdb.dts + create mode 100644 arch/powerpc/boot/dts/t1042rdb_pi.dts + create mode 100644 arch/powerpc/boot/dts/t104xrdb.dtsi + create mode 100644 arch/powerpc/include/asm/copro.h + create mode 100644 arch/powerpc/include/asm/pnv-pci.h + create mode 100644 arch/powerpc/kernel/ppc_ksyms_32.c + create mode 100644 arch/powerpc/lib/ppc_ksyms.c + rename arch/powerpc/{platforms/cell/spu_fault.c => mm/copro_fault.c} (56%) + create mode 100644 drivers/misc/cxl/Kconfig + create mode 100644 drivers/misc/cxl/Makefile + create mode 100644 drivers/misc/cxl/base.c + create mode 100644 drivers/misc/cxl/context.c + create mode 100644 drivers/misc/cxl/cxl.h + create mode 100644 drivers/misc/cxl/debugfs.c + create mode 100644 drivers/misc/cxl/fault.c + create mode 100644 drivers/misc/cxl/file.c + create mode 100644 drivers/misc/cxl/irq.c + create mode 100644 drivers/misc/cxl/main.c + create mode 100644 drivers/misc/cxl/native.c + create mode 100644 drivers/misc/cxl/pci.c + create mode 100644 drivers/misc/cxl/sysfs.c + create mode 100644 include/misc/cxl.h + create mode 100644 include/uapi/misc/Kbuild + create mode 100644 include/uapi/misc/cxl.h + create mode 100644 tools/testing/selftests/powerpc/primitives/Makefile + create mode 120000 tools/testing/selftests/powerpc/primitives/asm/asm-compat.h + create mode 100644 tools/testing/selftests/powerpc/primitives/asm/ppc-opcode.h + create mode 100644 tools/testing/selftests/powerpc/primitives/load_unaligned_zeropad.c + create mode 120000 tools/testing/selftests/powerpc/primitives/word-at-a-time.h +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 (0cccdda8d151 s390/ftrace: simplify enabling/disabling of ftrace_graph_caller) +$ git merge s390/features +Auto-merging kernel/time/tick-sched.c +Auto-merging include/linux/tick.h +Auto-merging arch/s390/mm/vmem.c +Removing arch/s390/kernel/mcount64.S +Auto-merging arch/s390/include/asm/pgtable.h +Merge made by the 'recursive' strategy. + Documentation/kprobes.txt | 1 + + arch/s390/Kconfig | 11 +- + arch/s390/Makefile | 17 +- + arch/s390/include/asm/barrier.h | 6 +- + arch/s390/include/asm/cputime.h | 26 +-- + arch/s390/include/asm/dis.h | 13 +- + arch/s390/include/asm/elf.h | 3 +- + arch/s390/include/asm/ftrace.h | 9 +- + arch/s390/include/asm/idle.h | 26 +++ + arch/s390/include/asm/ipl.h | 4 +- + arch/s390/include/asm/irq.h | 1 + + arch/s390/include/asm/kprobes.h | 4 + + arch/s390/include/asm/lowcore.h | 21 +- + arch/s390/include/asm/nmi.h | 2 +- + arch/s390/include/asm/pgtable.h | 25 ++- + arch/s390/include/asm/processor.h | 12 +- + arch/s390/include/asm/ptrace.h | 6 + + arch/s390/include/asm/setup.h | 6 +- + arch/s390/include/asm/sigp.h | 6 +- + arch/s390/include/asm/smp.h | 2 - + arch/s390/include/asm/spinlock.h | 135 +++++++++--- + arch/s390/include/asm/spinlock_types.h | 1 + + arch/s390/include/asm/switch_to.h | 61 +++++- + arch/s390/include/asm/thread_info.h | 3 + + arch/s390/include/asm/uprobes.h | 42 ++++ + arch/s390/include/asm/vdso.h | 18 +- + arch/s390/include/asm/vtimer.h | 2 - + arch/s390/include/uapi/asm/sigcontext.h | 20 +- + arch/s390/include/uapi/asm/types.h | 4 + + arch/s390/include/uapi/asm/ucontext.h | 15 +- + arch/s390/kernel/Makefile | 8 +- + arch/s390/kernel/asm-offsets.c | 9 +- + arch/s390/kernel/compat_linux.h | 9 + + arch/s390/kernel/compat_signal.c | 212 +++++++++++++----- + arch/s390/kernel/crash_dump.c | 58 ++++- + arch/s390/kernel/dis.c | 245 ++++++++++++++++++++- + arch/s390/kernel/early.c | 4 +- + arch/s390/kernel/entry.h | 6 +- + arch/s390/kernel/entry64.S | 17 +- + arch/s390/kernel/ftrace.c | 139 +++++------- + arch/s390/kernel/head.S | 2 +- + arch/s390/kernel/idle.c | 124 +++++++++++ + arch/s390/kernel/irq.c | 3 +- + arch/s390/kernel/kprobes.c | 159 +------------- + arch/s390/kernel/machine_kexec.c | 8 +- + arch/s390/kernel/mcount.S | 86 ++++---- + arch/s390/kernel/mcount64.S | 62 ------ + arch/s390/kernel/nmi.c | 16 ++ + arch/s390/kernel/pgm_check.S | 2 +- + arch/s390/kernel/process.c | 24 --- + arch/s390/kernel/processor.c | 4 +- + arch/s390/kernel/ptrace.c | 254 +++++++++++++++++----- + arch/s390/kernel/setup.c | 13 +- + arch/s390/kernel/signal.c | 296 +++++++++++++++++++------ + arch/s390/kernel/smp.c | 80 +++---- + arch/s390/kernel/time.c | 13 ++ + arch/s390/kernel/topology.c | 18 +- + arch/s390/kernel/traps.c | 115 +++++++++- + arch/s390/kernel/uprobes.c | 332 ++++++++++++++++++++++++++++ + arch/s390/kernel/vdso32/clock_getres.S | 11 +- + arch/s390/kernel/vdso32/clock_gettime.S | 32 ++- + arch/s390/kernel/vdso32/gettimeofday.S | 4 +- + arch/s390/kernel/vdso64/clock_getres.S | 8 +- + arch/s390/kernel/vdso64/clock_gettime.S | 32 ++- + arch/s390/kernel/vdso64/gettimeofday.S | 4 +- + arch/s390/kernel/vtime.c | 77 +------ + arch/s390/lib/Makefile | 2 + + arch/s390/lib/delay.c | 4 +- + arch/s390/lib/probes.c | 159 ++++++++++++++ + arch/s390/lib/spinlock.c | 105 +++++---- + arch/s390/mm/dump_pagetables.c | 5 +- + arch/s390/mm/hugetlbpage.c | 2 +- + arch/s390/mm/pageattr.c | 38 +++- + arch/s390/mm/vmem.c | 8 +- + drivers/s390/block/dasd.c | 33 ++- + drivers/s390/block/dasd_devmap.c | 24 +++ + drivers/s390/block/dasd_eckd.c | 372 +++++++++++++++++++++++++++++++- + drivers/s390/block/dasd_eckd.h | 63 +++++- + drivers/s390/block/dasd_int.h | 10 +- + drivers/s390/char/Kconfig | 13 ++ + drivers/s390/char/Makefile | 3 + + drivers/s390/char/diag_ftp.c | 237 ++++++++++++++++++++ + drivers/s390/char/diag_ftp.h | 21 ++ + drivers/s390/char/hmcdrv_cache.c | 252 ++++++++++++++++++++++ + drivers/s390/char/hmcdrv_cache.h | 24 +++ + drivers/s390/char/hmcdrv_dev.c | 370 +++++++++++++++++++++++++++++++ + drivers/s390/char/hmcdrv_dev.h | 14 ++ + drivers/s390/char/hmcdrv_ftp.c | 343 +++++++++++++++++++++++++++++ + drivers/s390/char/hmcdrv_ftp.h | 63 ++++++ + drivers/s390/char/hmcdrv_mod.c | 64 ++++++ + drivers/s390/char/sclp.h | 2 + + drivers/s390/char/sclp_diag.h | 89 ++++++++ + drivers/s390/char/sclp_early.c | 2 +- + drivers/s390/char/sclp_ftp.c | 275 +++++++++++++++++++++++ + drivers/s390/char/sclp_ftp.h | 21 ++ + drivers/s390/char/sclp_rw.c | 13 +- + drivers/s390/char/sclp_vt220.c | 4 - + drivers/s390/char/tape_char.c | 4 +- + drivers/s390/char/zcore.c | 18 +- + drivers/s390/cio/airq.c | 2 +- + drivers/s390/cio/cio.c | 2 +- + drivers/s390/crypto/ap_bus.c | 30 ++- + drivers/s390/crypto/ap_bus.h | 7 +- + drivers/s390/crypto/zcrypt_api.c | 7 +- + include/linux/tick.h | 2 +- + include/uapi/linux/elf.h | 2 + + kernel/time/tick-sched.c | 2 +- + scripts/recordmcount.c | 4 - + scripts/recordmcount.pl | 7 - + 109 files changed, 4738 insertions(+), 972 deletions(-) + create mode 100644 arch/s390/include/asm/idle.h + create mode 100644 arch/s390/include/asm/uprobes.h + create mode 100644 arch/s390/kernel/idle.c + delete mode 100644 arch/s390/kernel/mcount64.S + create mode 100644 arch/s390/kernel/uprobes.c + create mode 100644 arch/s390/lib/probes.c + create mode 100644 drivers/s390/char/diag_ftp.c + create mode 100644 drivers/s390/char/diag_ftp.h + create mode 100644 drivers/s390/char/hmcdrv_cache.c + create mode 100644 drivers/s390/char/hmcdrv_cache.h + create mode 100644 drivers/s390/char/hmcdrv_dev.c + create mode 100644 drivers/s390/char/hmcdrv_dev.h + create mode 100644 drivers/s390/char/hmcdrv_ftp.c + create mode 100644 drivers/s390/char/hmcdrv_ftp.h + create mode 100644 drivers/s390/char/hmcdrv_mod.c + create mode 100644 drivers/s390/char/sclp_diag.h + create mode 100644 drivers/s390/char/sclp_ftp.c + create mode 100644 drivers/s390/char/sclp_ftp.h +Merging sparc-next/master (619df5d2870b Merge tag 'microblaze-3.17-rc5' of git://git.monstr.eu/linux-2.6-microblaze) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (78410af51146 tile: add clock_gettime support to vDSO) +$ git merge tile/master +Already up-to-date. +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/trap.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 d746b2528c1f] 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 (f2589bff1ce8 xtensa/uapi: Add definition of TIOC[SG]RS485) +$ git merge xtensa/for_next +Merge made by the 'recursive' strategy. +Merging btrfs/next (a43bb39b5c71 btrfs: Fix compile error when CONFIG_SECURITY is not set.) +$ git merge btrfs/next +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/btrfs_inode.h +Merge made by the 'recursive' strategy. + fs/btrfs/async-thread.c | 11 +- + fs/btrfs/async-thread.h | 1 + + fs/btrfs/backref.c | 123 +++++-- + fs/btrfs/backref.h | 3 + + fs/btrfs/btrfs_inode.h | 27 +- + fs/btrfs/check-integrity.c | 18 +- + fs/btrfs/compression.c | 21 +- + fs/btrfs/ctree.c | 106 +++--- + fs/btrfs/ctree.h | 93 +++--- + fs/btrfs/delayed-inode.c | 8 +- + fs/btrfs/dev-replace.c | 82 +++-- + fs/btrfs/dir-item.c | 12 +- + fs/btrfs/disk-io.c | 284 +++++++++------- + fs/btrfs/disk-io.h | 16 +- + fs/btrfs/export.c | 4 +- + fs/btrfs/extent-tree.c | 265 +++++++++++---- + fs/btrfs/extent_io.c | 483 +++++++++++++++++---------- + fs/btrfs/extent_io.h | 60 ++-- + fs/btrfs/file-item.c | 30 +- + fs/btrfs/file.c | 151 ++++++--- + fs/btrfs/free-space-cache.c | 157 ++++++++- + fs/btrfs/hash.c | 4 +- + fs/btrfs/inode-item.c | 12 +- + fs/btrfs/inode-map.c | 68 ++-- + fs/btrfs/inode.c | 648 ++++++++++++++++++++++++++++-------- + fs/btrfs/ioctl.c | 60 ++-- + fs/btrfs/lzo.c | 3 +- + fs/btrfs/orphan.c | 4 +- + fs/btrfs/print-tree.c | 3 +- + fs/btrfs/qgroup.c | 30 +- + fs/btrfs/raid56.c | 8 +- + fs/btrfs/reada.c | 2 +- + fs/btrfs/relocation.c | 142 ++++---- + fs/btrfs/scrub.c | 67 ++-- + fs/btrfs/send.c | 47 ++- + fs/btrfs/super.c | 137 +++++++- + fs/btrfs/sysfs.c | 41 ++- + fs/btrfs/sysfs.h | 16 +- + fs/btrfs/tests/free-space-tests.c | 516 ++++++++++++++++++++++++++++- + fs/btrfs/transaction.c | 52 ++- + fs/btrfs/transaction.h | 2 +- + fs/btrfs/tree-log.c | 259 +++++++++------ + fs/btrfs/tree-log.h | 2 + + fs/btrfs/uuid-tree.c | 1 - + fs/btrfs/volumes.c | 676 ++++++++++++++++++++++++-------------- + fs/btrfs/volumes.h | 166 ++++++++-- + fs/btrfs/xattr.c | 4 +- + fs/btrfs/zlib.c | 141 ++++---- + include/trace/events/btrfs.h | 85 ++++- + 49 files changed, 3617 insertions(+), 1534 deletions(-) +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 (4f927ed143fc Remap reserved posix characters by default (part 3/3)) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_fs_sb.h | 1 + + fs/cifs/cifs_unicode.c | 203 +++++++++++++++++++++++++++++++++++++------------ + fs/cifs/cifs_unicode.h | 31 +++++++- + fs/cifs/cifsencrypt.c | 2 +- + fs/cifs/cifsglob.h | 6 +- + fs/cifs/cifssmb.c | 16 ++-- + fs/cifs/connect.c | 46 +++++++++-- + fs/cifs/dir.c | 22 ++++-- + fs/cifs/file.c | 6 +- + fs/cifs/inode.c | 44 +++++------ + fs/cifs/link.c | 135 +++++++++++++++++++++++++++++++- + fs/cifs/readdir.c | 8 +- + fs/cifs/smb1ops.c | 33 ++++---- + fs/cifs/smb2misc.c | 12 ++- + fs/cifs/smb2ops.c | 20 +++-- + fs/cifs/smb2pdu.c | 2 + + fs/cifs/smb2pdu.h | 2 + + fs/cifs/smb2proto.h | 8 +- + fs/cifs/smbencrypt.c | 1 + + fs/cifs/xattr.c | 32 +++----- + 20 files changed, 470 insertions(+), 160 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 (35425ea24921 ecryptfs: avoid to access NULL pointer when write metadata in xattr) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/ecryptfs/file.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/file.c | 4 ++-- + fs/ecryptfs/inode.c | 18 ++++++++---------- + fs/ecryptfs/keystore.c | 2 -- + fs/ecryptfs/messaging.c | 3 +-- + 4 files changed, 11 insertions(+), 16 deletions(-) +Merging ext3/for_next (c53f755d339b ocfs2: Back out change to use OCFS2_MAXQUOTAS in ocfs2_setattr()) +$ git merge ext3/for_next +Auto-merging fs/ocfs2/super.c +Merge made by the 'recursive' strategy. + fs/ext3/ext3.h | 12 +++++++----- + fs/ext3/super.c | 14 +++++++------- + fs/ocfs2/file.c | 2 +- + fs/ocfs2/quota.h | 5 ++++- + fs/ocfs2/quota_global.c | 4 ++-- + fs/ocfs2/quota_local.c | 33 +++++++++++++++++---------------- + fs/ocfs2/super.c | 30 +++++++++++++++++------------- + fs/reiserfs/reiserfs.h | 5 ++++- + fs/reiserfs/super.c | 16 ++++++++-------- + fs/udf/file.c | 9 ++++++++- + fs/udf/udftime.c | 2 -- + 11 files changed, 75 insertions(+), 57 deletions(-) +Merging ext4/dev (1c8944cbe1b7 ext4: add ext4_iget_normal() which is to be used for dir tree lookups) +$ git merge ext4/dev +Auto-merging include/linux/mm.h +Auto-merging fs/ext4/namei.c +Auto-merging fs/buffer.c +Merge made by the 'recursive' strategy. + fs/buffer.c | 48 +- + fs/ext4/balloc.c | 3 +- + fs/ext4/dir.c | 8 +- + fs/ext4/ext4.h | 38 +- + fs/ext4/ext4_extents.h | 1 + + fs/ext4/ext4_jbd2.c | 4 +- + fs/ext4/ext4_jbd2.h | 6 +- + fs/ext4/extents.c | 613 +++++++++++++++++--------- + fs/ext4/extents_status.c | 200 ++++++++- + fs/ext4/extents_status.h | 13 +- + fs/ext4/indirect.c | 86 ++-- + fs/ext4/inline.c | 4 +- + fs/ext4/inode.c | 110 +++-- + fs/ext4/mballoc.c | 15 +- + fs/ext4/migrate.c | 11 +- + fs/ext4/move_extent.c | 1009 +++++-------------------------------------- + fs/ext4/namei.c | 201 ++++----- + fs/ext4/super.c | 225 +++++----- + fs/ext4/xattr.c | 38 +- + fs/jbd/journal.c | 2 +- + fs/jbd2/checkpoint.c | 334 ++++++-------- + fs/jbd2/journal.c | 18 +- + fs/jbd2/recovery.c | 1 + + include/linux/buffer_head.h | 47 +- + include/linux/jbd2.h | 2 +- + include/linux/mm.h | 1 + + include/trace/events/ext4.h | 59 ++- + mm/truncate.c | 57 +++ + 28 files changed, 1403 insertions(+), 1751 deletions(-) +Merging f2fs/dev (da01e61428aa Merge tag 'f2fs-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge f2fs/dev +Already up-to-date. +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 81e6a33e8736] 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 (d29c0afe4db7 GFS2: use _RET_IP_ instead of (unsigned long)__builtin_return_address(0)) +$ git merge gfs2/master +Merge made by the 'recursive' strategy. + fs/gfs2/dir.c | 9 +++++++-- + fs/gfs2/dir.h | 1 + + fs/gfs2/glock.c | 4 ++-- + fs/gfs2/glops.c | 2 +- + fs/gfs2/inode.c | 7 ++++--- + fs/gfs2/rgrp.c | 30 +++++++++++++++++++++--------- + fs/gfs2/rgrp.h | 1 + + fs/gfs2/trans.c | 2 +- + 8 files changed, 38 insertions(+), 18 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 (b4b56796fe63 Merge branch 'client-4.2' into linux-next) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/Makefile | 1 + + fs/nfs/inode.c | 2 + + fs/nfs/nfs42.h | 14 +++++++ + fs/nfs/nfs42proc.c | 69 +++++++++++++++++++++++++++++++++ + fs/nfs/nfs42xdr.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++ + fs/nfs/nfs4_fs.h | 3 ++ + fs/nfs/nfs4file.c | 25 ++++++++++++ + fs/nfs/nfs4proc.c | 4 +- + fs/nfs/nfs4xdr.c | 7 ++++ + include/linux/nfs4.h | 3 ++ + include/linux/nfs_fs_sb.h | 1 + + include/linux/nfs_xdr.h | 19 +++++++++ + 12 files changed, 244 insertions(+), 2 deletions(-) + create mode 100644 fs/nfs/nfs42.h + create mode 100644 fs/nfs/nfs42proc.c + create mode 100644 fs/nfs/nfs42xdr.c +Merging nfsd/nfsd-next (34549ab09e62 nfsd: eliminate "to_delegation" define) +$ git merge nfsd/nfsd-next +Already up-to-date. +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 +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/block.c | 36 +++++++++++++++++++++++++----------- + drivers/mtd/ubi/cdev.c | 6 ++++-- + drivers/mtd/ubi/eba.c | 5 ++--- + drivers/mtd/ubi/fastmap.c | 4 +++- + drivers/mtd/ubi/ubi.h | 12 +++++++----- + drivers/mtd/ubi/wl.c | 28 +++++++++++++++------------- + fs/ubifs/commit.c | 8 +++----- + fs/ubifs/debug.c | 6 +++--- + fs/ubifs/journal.c | 7 +++---- + fs/ubifs/log.c | 19 ++++++++++++++----- + 10 files changed, 79 insertions(+), 52 deletions(-) +Merging xfs/for-next (bdb119bb6e9d Merge branch 'xfs-misc-fixes-for-3.18-3' into for-next) +$ git merge xfs/for-next +Removing fs/xfs/time.h +Merge made by the 'recursive' strategy. + fs/xfs/kmem.c | 1 - + fs/xfs/libxfs/xfs_alloc.c | 4 + + fs/xfs/libxfs/xfs_bmap.c | 365 ++++++++++++++-------- + fs/xfs/libxfs/xfs_bmap.h | 7 +- + fs/xfs/libxfs/xfs_da_btree.c | 3 +- + fs/xfs/libxfs/xfs_da_format.c | 1 - + fs/xfs/libxfs/xfs_dir2.c | 67 +--- + fs/xfs/libxfs/xfs_dir2.h | 2 +- + fs/xfs/libxfs/xfs_ialloc.c | 7 +- + fs/xfs/libxfs/xfs_rtbitmap.c | 49 ++- + fs/xfs/libxfs/xfs_sb.c | 7 + + fs/xfs/time.h | 36 --- + fs/xfs/xfs_aops.c | 23 +- + fs/xfs/xfs_bmap_util.c | 126 ++++---- + fs/xfs/xfs_buf.c | 355 +++++++++++----------- + fs/xfs/xfs_buf.h | 15 +- + fs/xfs/xfs_buf_item.c | 10 +- + fs/xfs/xfs_file.c | 178 ++++------- + fs/xfs/xfs_fsops.c | 11 +- + fs/xfs/xfs_globals.c | 4 + + fs/xfs/xfs_icache.c | 1 - + fs/xfs/xfs_inode.c | 34 ++- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_inode_item.c | 2 +- + fs/xfs/xfs_ioctl.c | 28 +- + fs/xfs/xfs_ioctl32.c | 2 + + fs/xfs/xfs_ioctl32.h | 3 +- + fs/xfs/xfs_iomap.c | 4 +- + fs/xfs/xfs_iops.c | 30 ++ + fs/xfs/xfs_linux.h | 6 +- + fs/xfs/xfs_log.c | 59 ++-- + fs/xfs/xfs_log_cil.c | 47 ++- + fs/xfs/xfs_log_recover.c | 689 ++++++++++++++++++++++-------------------- + fs/xfs/xfs_mount.c | 58 ++-- + fs/xfs/xfs_mru_cache.c | 3 +- + fs/xfs/xfs_qm.c | 1 + + fs/xfs/xfs_rtalloc.c | 85 +----- + fs/xfs/xfs_rtalloc.h | 4 + + fs/xfs/xfs_super.c | 39 ++- + fs/xfs/xfs_symlink.c | 8 +- + fs/xfs/xfs_sysctl.h | 5 + + fs/xfs/xfs_sysfs.c | 74 +++++ + fs/xfs/xfs_sysfs.h | 1 + + fs/xfs/xfs_trace.h | 3 +- + fs/xfs/xfs_trans_buf.c | 16 +- + fs/xfs/xfs_trans_inode.c | 2 +- + 46 files changed, 1302 insertions(+), 1175 deletions(-) + delete mode 100644 fs/xfs/time.h +Merging file-locks/linux-next (1b2b32dcdb3d locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING) +$ git merge file-locks/linux-next +Resolved 'fs/locks.c' using previous resolution. +Auto-merging net/socket.c +Auto-merging fs/nfsd/state.h +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfs/nfs4file.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/file.c +Auto-merging fs/locks.c +CONFLICT (content): Merge conflict in fs/locks.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging drivers/tty/tty_io.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 48588b5bc591] Merge remote-tracking branch 'file-locks/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 11 +- + Documentation/filesystems/vfs.txt | 7 +- + drivers/net/tun.c | 4 +- + drivers/tty/tty_io.c | 3 +- + fs/cifs/cifsfs.c | 7 +- + fs/dlm/plock.c | 8 +- + fs/fcntl.c | 21 +- + fs/gfs2/file.c | 22 +- + fs/libfs.c | 18 ++ + fs/lockd/svclock.c | 68 +----- + fs/locks.c | 444 +++++++++++++++++--------------------- + fs/nfs/file.c | 13 +- + fs/nfs/internal.h | 1 - + fs/nfs/nfs4file.c | 2 +- + fs/nfsd/nfs4state.c | 104 +++++---- + fs/nfsd/state.h | 1 - + fs/notify/dnotify/dnotify.c | 8 +- + include/linux/fs.h | 59 ++--- + include/linux/lockd/lockd.h | 1 - + include/linux/security.h | 8 +- + include/trace/events/filelock.h | 14 +- + net/socket.c | 3 +- + security/capability.c | 4 +- + security/security.c | 4 +- + security/selinux/hooks.c | 4 +- + security/smack/smack_lsm.c | 3 +- + 26 files changed, 354 insertions(+), 488 deletions(-) +Merging vfs/for-next (24dff96a37a2 fix misuses of f_count() in ppp and netlink) +$ git merge vfs/for-next +Resolved 'drivers/usb/gadget/function/f_fs.c' using previous resolution. +Auto-merging include/linux/fs.h +Auto-merging fs/gfs2/inode.c +Auto-merging fs/ecryptfs/file.c +Auto-merging fs/cifs/readdir.c +Auto-merging fs/cifs/inode.c +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/dir.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging drivers/usb/gadget/legacy/inode.c +Auto-merging drivers/usb/gadget/function/f_fs.c +CONFLICT (content): Merge conflict in drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/staging/vme/devices/vme_user.c +Auto-merging drivers/net/ppp/ppp_generic.c +Auto-merging Documentation/filesystems/vfs.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6370e0e5ebe9] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/vfs.txt | 2 +- + arch/alpha/kernel/osf_sys.c | 23 ++- + arch/x86/ia32/ia32_aout.c | 21 +-- + drivers/block/rsxx/core.c | 81 ++-------- + drivers/bluetooth/hci_vhci.c | 22 +-- + drivers/char/mem.c | 56 ++----- + drivers/dma-buf/dma-buf.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_nvif.c | 4 +- + drivers/gpu/drm/nouveau/nvif/driver.h | 4 +- + drivers/gpu/drm/nouveau/nvif/object.h | 6 +- + drivers/infiniband/hw/ipath/ipath_fs.c | 1 - + drivers/infiniband/hw/qib/qib_fs.c | 1 - + drivers/misc/carma/carma-fpga-program.c | 30 +--- + drivers/net/ppp/ppp_generic.c | 2 +- + drivers/s390/char/vmlogrdr.c | 1 - + drivers/staging/android/ashmem.c | 2 +- + drivers/staging/android/ion/compat_ion.c | 2 +- + drivers/staging/android/logger.c | 103 ++++--------- + drivers/staging/vme/devices/vme_user.c | 28 +--- + drivers/usb/gadget/function/f_fs.c | 24 ++- + drivers/usb/gadget/legacy/inode.c | 26 ++-- + fs/9p/fid.c | 4 +- + fs/9p/vfs_addr.c | 4 +- + fs/9p/vfs_dentry.c | 8 +- + fs/9p/vfs_dir.c | 4 +- + fs/9p/vfs_file.c | 8 +- + fs/9p/vfs_inode.c | 32 ++-- + fs/9p/vfs_inode_dotl.c | 8 +- + fs/afs/dir.c | 5 - + fs/autofs4/expire.c | 6 - + fs/binfmt_aout.c | 25 +-- + fs/binfmt_elf.c | 25 +-- + fs/binfmt_elf_fdpic.c | 24 +-- + fs/btrfs/ioctl.c | 5 +- + fs/buffer.c | 5 + + fs/cachefiles/rdwr.c | 48 +++--- + fs/ceph/dir.c | 1 - + fs/cifs/dir.c | 14 +- + fs/cifs/file.c | 12 +- + fs/cifs/inode.c | 12 +- + fs/cifs/readdir.c | 6 +- + fs/compat.c | 28 ++-- + fs/dcache.c | 254 +++++++++++++++---------------- + fs/ecryptfs/file.c | 2 +- + fs/exec.c | 17 ++- + fs/file.c | 1 + + fs/fuse/dir.c | 7 +- + fs/gfs2/dentry.c | 3 - + fs/gfs2/inode.c | 5 + + fs/internal.h | 2 +- + fs/jffs2/jffs2_fs_sb.h | 2 - + fs/jffs2/wbuf.c | 17 +-- + fs/jfs/super.c | 2 +- + fs/kernfs/dir.c | 11 -- + fs/mount.h | 25 ++- + fs/namei.c | 22 +-- + fs/namespace.c | 203 +++++++++++++++++------- + fs/ncpfs/dir.c | 6 +- + fs/ncpfs/ncplib_kernel.h | 14 +- + fs/nfs/dir.c | 7 +- + fs/proc/base.c | 10 +- + fs/proc/fd.c | 2 - + fs/read_write.c | 2 + + fs/super.c | 2 + + include/linux/dcache.h | 3 +- + include/linux/fs.h | 5 +- + include/linux/uio.h | 3 + + kernel/printk/printk.c | 20 +-- + mm/iov_iter.c | 240 +++++++++++++++++++++++++++-- + net/netlink/af_netlink.c | 2 +- + tools/perf/util/string.c | 90 ++++------- + 71 files changed, 840 insertions(+), 864 deletions(-) +Merging pci/next (f92d9ee3ab39 Merge branch 'pci/host-xgene' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (3fd9127d236c Merge branch 'for-3.18/uhid' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-hid-driver-gt683r | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + create mode 100644 Documentation/ABI/testing/sysfs-class-hid-driver-gt683r +Merging i2c/i2c/for-next (a4ce47f108a6 i2c-imx: Disable the clock on probe failure) +$ git merge i2c/i2c/for-next +Auto-merging drivers/i2c/busses/i2c-rk3x.c +Auto-merging drivers/i2c/busses/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-axxia.txt | 30 ++ + .../devicetree/bindings/i2c/i2c-exynos5.txt | 2 + + drivers/i2c/busses/Kconfig | 14 +- + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-axxia.c | 559 +++++++++++++++++++++ + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 15 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 96 +++- + drivers/i2c/busses/i2c-exynos5.c | 71 ++- + drivers/i2c/busses/i2c-imx.c | 16 +- + drivers/i2c/busses/i2c-ismt.c | 2 +- + drivers/i2c/busses/i2c-mxs.c | 3 + + drivers/i2c/busses/i2c-rcar.c | 21 +- + drivers/i2c/busses/i2c-rk3x.c | 4 +- + include/linux/mfd/cros_ec_commands.h | 3 - + include/linux/platform_data/i2c-designware.h | 21 + + 15 files changed, 807 insertions(+), 51 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-axxia.txt + create mode 100644 drivers/i2c/busses/i2c-axxia.c + create mode 100644 include/linux/platform_data/i2c-designware.h +Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (3afb57fa721f hwmon: (ab8500) Call kernel_power_off instead of pm_power_off) +$ git merge hwmon-staging/hwmon-next +Auto-merging drivers/watchdog/Kconfig +Auto-merging drivers/leds/Makefile +Auto-merging drivers/leds/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/ntc_thermistor.txt | 3 + + Documentation/hwmon/k10temp | 2 +- + Documentation/hwmon/menf21bmc | 50 +++++ + MAINTAINERS | 8 + + drivers/hwmon/Kconfig | 15 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/ab8500.c | 5 +- + drivers/hwmon/ads1015.c | 21 +- + drivers/hwmon/da9052-hwmon.c | 54 +---- + drivers/hwmon/da9055-hwmon.c | 52 +---- + drivers/hwmon/k10temp.c | 157 +++++++------- + drivers/hwmon/menf21bmc_hwmon.c | 230 +++++++++++++++++++++ + drivers/hwmon/ntc_thermistor.c | 25 +++ + drivers/hwmon/smsc47b397.c | 51 +---- + drivers/leds/Kconfig | 9 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-menf21bmc.c | 131 ++++++++++++ + drivers/mfd/Kconfig | 15 ++ + drivers/mfd/Makefile | 1 + + drivers/mfd/menf21bmc.c | 132 ++++++++++++ + drivers/watchdog/Kconfig | 10 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/menf21bmc_wdt.c | 203 ++++++++++++++++++ + 23 files changed, 949 insertions(+), 228 deletions(-) + create mode 100644 Documentation/hwmon/menf21bmc + create mode 100644 drivers/hwmon/menf21bmc_hwmon.c + create mode 100644 drivers/leds/leds-menf21bmc.c + create mode 100644 drivers/mfd/menf21bmc.c + create mode 100644 drivers/watchdog/menf21bmc_wdt.c +Merging v4l-dvb/master (8f2f28bac3d1 Merge branch 'topic/si2165' into to_next) +$ git merge v4l-dvb/master +Auto-merging include/uapi/linux/Kbuild +Auto-merging drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/staging/media/lirc/lirc_imon.c +Removing drivers/staging/media/as102/as102_fe.c +Auto-merging drivers/media/usb/as102/as10x_handle.h +Auto-merging drivers/media/usb/as102/as10x_cmd_stream.c +Auto-merging drivers/media/usb/as102/as10x_cmd_cfg.c +Auto-merging drivers/media/usb/as102/as10x_cmd.h +Auto-merging drivers/media/usb/as102/as10x_cmd.c +Auto-merging drivers/media/usb/as102/as102_usb_drv.h +Auto-merging drivers/media/usb/as102/as102_usb_drv.c +Auto-merging drivers/media/usb/as102/as102_fw.h +Auto-merging drivers/media/usb/as102/as102_fw.c +Auto-merging drivers/media/usb/as102/as102_drv.h +Auto-merging drivers/media/usb/as102/as102_drv.c +Auto-merging drivers/media/usb/as102/Makefile +Removing drivers/media/tuners/tuner_it913x_priv.h +Removing drivers/media/tuners/tuner_it913x.c +Auto-merging drivers/media/tuners/it913x.h +Removing drivers/media/platform/vivi.c +Removing drivers/media/platform/coda.c +Auto-merging drivers/media/pci/cx23885/cx23888-ir.c +Auto-merging drivers/media/dvb-frontends/cxd2820r_core.c +Auto-merging drivers/media/dvb-frontends/as102_fe_types.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/DocBook/media/v4l/compat.xml | 6 + + Documentation/DocBook/media/v4l/controls.xml | 55 + + .../DocBook/media/v4l/pixfmt-packed-rgb.xml | 52 +- + Documentation/DocBook/media/v4l/vidioc-dqevent.xml | 7 +- + Documentation/DocBook/media/v4l/vidioc-g-edid.xml | 14 +- + .../DocBook/media/v4l/vidioc-subscribe-event.xml | 2 +- + .../devicetree/bindings/media/hix5hd2-ir.txt | 25 + + Documentation/dvb/get_dvb_firmware | 44 +- + Documentation/video4linux/vivid.txt | 1111 ++++++ + MAINTAINERS | 28 +- + drivers/media/common/b2c2/flexcop.h | 2 +- + drivers/media/common/saa7146/saa7146_fops.c | 3 - + drivers/media/common/siano/sms-cards.c | 6 + + drivers/media/common/siano/sms-cards.h | 1 + + drivers/media/common/siano/smscoreapi.c | 4 +- + drivers/media/dvb-core/dmxdev.c | 7 +- + drivers/media/dvb-core/dvb-usb-ids.h | 2 + + drivers/media/dvb-core/dvb_frontend.c | 45 +- + drivers/media/dvb-core/dvb_frontend.h | 2 + + drivers/media/dvb-core/dvb_ringbuffer.c | 26 + + drivers/media/dvb-core/dvb_ringbuffer.h | 2 + + drivers/media/dvb-frontends/Kconfig | 21 + + drivers/media/dvb-frontends/Makefile | 4 +- + drivers/media/dvb-frontends/af9013.c | 24 +- + drivers/media/dvb-frontends/af9033.c | 757 ++-- + drivers/media/dvb-frontends/af9033.h | 58 +- + drivers/media/dvb-frontends/af9033_priv.h | 1 + + drivers/media/dvb-frontends/as102_fe.c | 480 +++ + drivers/media/dvb-frontends/as102_fe.h | 29 + + .../dvb-frontends/as102_fe_types.h} | 6 - + drivers/media/dvb-frontends/bcm3510.c | 6 +- + drivers/media/dvb-frontends/cxd2820r_c.c | 4 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 4 +- + drivers/media/dvb-frontends/cxd2820r_t.c | 4 +- + drivers/media/dvb-frontends/dib7000p.c | 2 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 38 +- + drivers/media/dvb-frontends/drxd_hard.c | 9 +- + drivers/media/dvb-frontends/drxk_hard.c | 37 +- + drivers/media/dvb-frontends/m88ds3103.c | 101 +- + drivers/media/dvb-frontends/m88ds3103.h | 35 +- + drivers/media/dvb-frontends/mb86a16.c | 6 +- + drivers/media/dvb-frontends/mb86a20s.c | 14 +- + drivers/media/dvb-frontends/mt312.c | 2 +- + drivers/media/dvb-frontends/or51211.c | 2 +- + drivers/media/dvb-frontends/rtl2832.c | 2 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 118 +- + drivers/media/dvb-frontends/si2165.c | 168 +- + drivers/media/dvb-frontends/si2165_priv.h | 2 +- + drivers/media/dvb-frontends/si2168.c | 131 +- + drivers/media/dvb-frontends/si2168.h | 6 + + drivers/media/dvb-frontends/si2168_priv.h | 2 + + drivers/media/dvb-frontends/si21xx.c | 3 + + drivers/media/dvb-frontends/sp2.c | 441 +++ + drivers/media/dvb-frontends/sp2.h | 53 + + drivers/media/dvb-frontends/sp2_priv.h | 50 + + drivers/media/dvb-frontends/sp8870.c | 3 +- + drivers/media/dvb-frontends/stv0367.c | 12 +- + drivers/media/dvb-frontends/stv0900_core.c | 7 +- + drivers/media/dvb-frontends/stv0900_sw.c | 3 +- + drivers/media/dvb-frontends/tc90522.c | 840 +++++ + drivers/media/dvb-frontends/tc90522.h | 42 + + drivers/media/dvb-frontends/tda10071.c | 2 +- + drivers/media/dvb-frontends/zl10039.c | 2 +- + drivers/media/firewire/firedtv-avc.c | 10 + + drivers/media/i2c/adv7343_regs.h | 2 +- + drivers/media/i2c/adv7604.c | 2 +- + drivers/media/i2c/adv7842.c | 4 +- + drivers/media/i2c/lm3560.c | 4 +- + drivers/media/i2c/ov7670.c | 14 +- + drivers/media/i2c/s5k5baf.c | 2 +- + drivers/media/i2c/saa6752hs.c | 6 +- + drivers/media/i2c/smiapp/smiapp-core.c | 143 +- + drivers/media/i2c/smiapp/smiapp.h | 4 + + drivers/media/i2c/soc_camera/mt9t112.c | 4 +- + drivers/media/i2c/soc_camera/ov772x.c | 5 +- + drivers/media/i2c/soc_camera/ov9740.c | 4 +- + drivers/media/i2c/tda7432.c | 2 +- + drivers/media/i2c/tvp7002.c | 21 +- + drivers/media/i2c/vs6624.c | 14 +- + drivers/media/media-device.c | 6 +- + drivers/media/media-devnode.c | 3 +- + drivers/media/parport/pms.c | 7 +- + drivers/media/pci/Kconfig | 2 + + drivers/media/pci/Makefile | 3 +- + drivers/media/pci/bt8xx/bttv-driver.c | 5 +- + drivers/media/pci/bt8xx/dst_ca.c | 4 +- + drivers/media/pci/cx18/cx18-alsa-pcm.c | 2 +- + drivers/media/pci/cx18/cx18-firmware.c | 6 +- + drivers/media/pci/cx18/cx18-queue.c | 2 +- + drivers/media/pci/cx23885/Kconfig | 9 +- + drivers/media/pci/cx23885/Makefile | 1 - + drivers/media/pci/cx23885/altera-ci.c | 8 +- + drivers/media/pci/cx23885/altera-ci.h | 4 - + drivers/media/pci/cx23885/cimax2.c | 4 - + drivers/media/pci/cx23885/cimax2.h | 4 - + drivers/media/pci/cx23885/cx23885-417.c | 503 +-- + drivers/media/pci/cx23885/cx23885-alsa.c | 109 +- + drivers/media/pci/cx23885/cx23885-av.c | 5 - + drivers/media/pci/cx23885/cx23885-av.h | 5 - + drivers/media/pci/cx23885/cx23885-cards.c | 32 +- + drivers/media/pci/cx23885/cx23885-core.c | 362 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 323 +- + drivers/media/pci/cx23885/cx23885-f300.c | 4 - + drivers/media/pci/cx23885/cx23885-i2c.c | 12 - + drivers/media/pci/cx23885/cx23885-input.c | 5 - + drivers/media/pci/cx23885/cx23885-input.h | 5 - + drivers/media/pci/cx23885/cx23885-ioctl.c | 10 +- + drivers/media/pci/cx23885/cx23885-ioctl.h | 4 - + drivers/media/pci/cx23885/cx23885-ir.c | 5 - + drivers/media/pci/cx23885/cx23885-ir.h | 5 - + drivers/media/pci/cx23885/cx23885-reg.h | 4 - + drivers/media/pci/cx23885/cx23885-vbi.c | 284 +- + drivers/media/pci/cx23885/cx23885-video.c | 1294 ++----- + drivers/media/pci/cx23885/cx23885-video.h | 5 - + drivers/media/pci/cx23885/cx23885.h | 136 +- + drivers/media/pci/cx23885/cx23888-ir.c | 5 - + drivers/media/pci/cx23885/cx23888-ir.h | 5 - + drivers/media/pci/cx23885/netup-eeprom.c | 4 - + drivers/media/pci/cx23885/netup-eeprom.h | 4 - + drivers/media/pci/cx23885/netup-init.c | 4 - + drivers/media/pci/cx23885/netup-init.h | 4 - + drivers/media/pci/cx25821/cx25821-video-upstream.c | 5 +- + drivers/media/pci/cx88/cx88-cards.c | 632 ++-- + drivers/media/pci/cx88/cx88-video.c | 3 - + drivers/media/pci/ddbridge/ddbridge-core.c | 30 +- + drivers/media/pci/ddbridge/ddbridge.h | 12 +- + drivers/media/pci/dm1105/dm1105.c | 2 +- + drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 2 +- + drivers/media/pci/ivtv/ivtv-firmware.c | 4 +- + drivers/media/pci/ivtv/ivtv-irq.c | 12 +- + drivers/media/pci/mantis/hopper_vp3028.c | 2 +- + drivers/media/pci/mantis/mantis_common.h | 2 +- + drivers/media/pci/mantis/mantis_vp1033.c | 4 +- + drivers/media/pci/mantis/mantis_vp1034.c | 2 +- + drivers/media/pci/mantis/mantis_vp1041.c | 4 +- + drivers/media/pci/mantis/mantis_vp2033.c | 4 +- + drivers/media/pci/mantis/mantis_vp2040.c | 4 +- + drivers/media/pci/mantis/mantis_vp3030.c | 4 +- + drivers/media/pci/ngene/ngene-cards.c | 2 +- + drivers/media/pci/ngene/ngene-core.c | 14 +- + drivers/media/pci/ngene/ngene-dvb.c | 7 +- + drivers/media/pci/ngene/ngene.h | 2 +- + drivers/media/pci/pt3/Kconfig | 10 + + drivers/media/pci/pt3/Makefile | 8 + + drivers/media/pci/pt3/pt3.c | 876 +++++ + drivers/media/pci/pt3/pt3.h | 186 + + drivers/media/pci/pt3/pt3_dma.c | 225 ++ + drivers/media/pci/pt3/pt3_i2c.c | 240 ++ + drivers/media/pci/saa7134/Kconfig | 8 + + drivers/media/pci/saa7134/Makefile | 2 + + drivers/media/pci/saa7134/saa7134-cards.c | 29 + + drivers/media/pci/saa7134/saa7134-core.c | 10 +- + drivers/media/pci/saa7134/saa7134-go7007.c | 531 +++ + drivers/media/pci/saa7134/saa7134-vbi.c | 2 +- + drivers/media/pci/saa7134/saa7134-video.c | 2 +- + drivers/media/pci/saa7134/saa7134.h | 5 + + drivers/media/pci/saa7164/saa7164-api.c | 3 +- + drivers/media/pci/saa7164/saa7164-core.c | 6 +- + drivers/media/pci/solo6x10/Kconfig | 1 + + drivers/media/pci/solo6x10/solo6x10-disp.c | 4 +- + drivers/media/pci/solo6x10/solo6x10-eeprom.c | 8 +- + drivers/media/pci/solo6x10/solo6x10.h | 4 +- + drivers/media/pci/sta2x11/Kconfig | 1 + + drivers/media/pci/sta2x11/sta2x11_vip.c | 2 +- + drivers/media/pci/ttpci/Kconfig | 4 + + drivers/media/pci/ttpci/Makefile | 2 +- + drivers/media/pci/ttpci/av7110.c | 8 +- + drivers/media/pci/tw68/Kconfig | 10 + + drivers/media/pci/tw68/Makefile | 3 + + drivers/media/pci/tw68/tw68-core.c | 434 +++ + drivers/media/pci/tw68/tw68-reg.h | 195 + + drivers/media/pci/tw68/tw68-risc.c | 230 ++ + drivers/media/pci/tw68/tw68-video.c | 1051 ++++++ + drivers/media/pci/tw68/tw68.h | 231 ++ + drivers/media/pci/zoran/zoran_device.c | 2 +- + drivers/media/platform/Kconfig | 54 +- + drivers/media/platform/Makefile | 8 +- + drivers/media/platform/blackfin/Kconfig | 1 + + drivers/media/platform/coda.c | 3933 -------------------- + drivers/media/platform/coda/Makefile | 3 + + drivers/media/platform/coda/coda-bit.c | 1861 +++++++++ + drivers/media/platform/coda/coda-common.c | 2052 ++++++++++ + drivers/media/platform/coda/coda-h264.c | 37 + + drivers/media/platform/coda/coda.h | 287 ++ + .../media/platform/{coda.h => coda/coda_regs.h} | 0 + drivers/media/platform/davinci/Kconfig | 18 +- + drivers/media/platform/davinci/dm355_ccdc.c | 2 +- + drivers/media/platform/davinci/dm644x_ccdc.c | 14 +- + drivers/media/platform/davinci/vpfe_capture.c | 16 +- + drivers/media/platform/davinci/vpif.c | 1 + + drivers/media/platform/davinci/vpif_capture.c | 13 +- + drivers/media/platform/davinci/vpif_display.c | 22 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 6 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 3 - + drivers/media/platform/exynos-gsc/gsc-regs.c | 8 +- + drivers/media/platform/exynos4-is/Kconfig | 5 +- + drivers/media/platform/exynos4-is/fimc-is-errno.c | 4 +- + drivers/media/platform/exynos4-is/fimc-is-errno.h | 4 +- + drivers/media/platform/exynos4-is/fimc-is-param.c | 2 - + drivers/media/platform/exynos4-is/fimc-is.c | 10 +- + drivers/media/platform/exynos4-is/fimc-isp-video.c | 9 +- + drivers/media/platform/exynos4-is/media-dev.c | 4 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 3 +- + drivers/media/platform/marvell-ccic/Kconfig | 2 + + drivers/media/platform/marvell-ccic/mcam-core.c | 2 +- + drivers/media/platform/mx2_emmaprp.c | 2 +- + drivers/media/platform/omap/Kconfig | 2 +- + drivers/media/platform/omap/omap_vout.c | 16 +- + drivers/media/platform/omap/omap_vout_vrfb.c | 10 +- + drivers/media/platform/omap/omap_vout_vrfb.h | 18 +- + drivers/media/platform/omap3isp/cfa_coef_table.h | 10 - + drivers/media/platform/omap3isp/gamma_table.h | 10 - + drivers/media/platform/omap3isp/isp.c | 20 +- + drivers/media/platform/omap3isp/isp.h | 10 - + drivers/media/platform/omap3isp/ispccdc.c | 424 ++- + drivers/media/platform/omap3isp/ispccdc.h | 21 +- + drivers/media/platform/omap3isp/ispccp2.c | 10 - + drivers/media/platform/omap3isp/ispccp2.h | 10 - + drivers/media/platform/omap3isp/ispcsi2.c | 10 - + drivers/media/platform/omap3isp/ispcsi2.h | 10 - + drivers/media/platform/omap3isp/ispcsiphy.c | 10 - + drivers/media/platform/omap3isp/ispcsiphy.h | 10 - + drivers/media/platform/omap3isp/isph3a.h | 10 - + drivers/media/platform/omap3isp/isph3a_aewb.c | 10 - + drivers/media/platform/omap3isp/isph3a_af.c | 10 - + drivers/media/platform/omap3isp/isphist.c | 10 - + drivers/media/platform/omap3isp/isphist.h | 10 - + drivers/media/platform/omap3isp/isppreview.c | 10 - + drivers/media/platform/omap3isp/isppreview.h | 10 - + drivers/media/platform/omap3isp/ispreg.h | 20 +- + drivers/media/platform/omap3isp/ispresizer.c | 80 +- + drivers/media/platform/omap3isp/ispresizer.h | 13 +- + drivers/media/platform/omap3isp/ispstat.c | 10 - + drivers/media/platform/omap3isp/ispstat.h | 10 - + drivers/media/platform/omap3isp/ispvideo.c | 59 +- + drivers/media/platform/omap3isp/ispvideo.h | 12 +- + .../media/platform/omap3isp/luma_enhance_table.h | 10 - + .../media/platform/omap3isp/noise_filter_table.h | 10 - + drivers/media/platform/s3c-camif/camif-capture.c | 4 +- + drivers/media/platform/s3c-camif/camif-regs.c | 4 +- + drivers/media/platform/s5p-g2d/g2d.c | 7 +- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 2 +- + .../media/platform/s5p-jpeg/jpeg-hw-exynos3250.c | 2 + + drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c | 11 +- + drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c | 6 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 83 +- + drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c | 1 + + drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 1 + + drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 6 + + drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 27 +- + drivers/media/platform/s5p-mfc/s5p_mfc_debug.h | 6 +- + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 54 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 67 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 4 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 488 +-- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 31 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 491 ++- + drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 2 +- + drivers/media/platform/s5p-tv/Kconfig | 4 +- + drivers/media/platform/s5p-tv/hdmi_drv.c | 2 +- + drivers/media/platform/s5p-tv/sdo_drv.c | 2 +- + drivers/media/platform/s5p-tv/sii9234_drv.c | 2 +- + drivers/media/platform/sh_veu.c | 4 +- + drivers/media/platform/soc_camera/Kconfig | 16 +- + drivers/media/platform/soc_camera/atmel-isi.c | 13 +- + drivers/media/platform/soc_camera/mx2_camera.c | 5 +- + drivers/media/platform/soc_camera/pxa_camera.c | 2 +- + drivers/media/platform/soc_camera/rcar_vin.c | 4 +- + drivers/media/platform/soc_camera/soc_camera.c | 21 +- + drivers/media/platform/ti-vpe/vpdma.c | 4 +- + drivers/media/platform/ti-vpe/vpe.c | 20 +- + drivers/media/platform/via-camera.c | 13 +- + drivers/media/platform/vivi.c | 1542 -------- + drivers/media/platform/vivid/Kconfig | 19 + + drivers/media/platform/vivid/Makefile | 6 + + drivers/media/platform/vivid/vivid-core.c | 1390 +++++++ + drivers/media/platform/vivid/vivid-core.h | 520 +++ + drivers/media/platform/vivid/vivid-ctrls.c | 1502 ++++++++ + drivers/media/platform/vivid/vivid-ctrls.h | 34 + + drivers/media/platform/vivid/vivid-kthread-cap.c | 886 +++++ + drivers/media/platform/vivid/vivid-kthread-cap.h | 26 + + drivers/media/platform/vivid/vivid-kthread-out.c | 305 ++ + drivers/media/platform/vivid/vivid-kthread-out.h | 26 + + drivers/media/platform/vivid/vivid-osd.c | 400 ++ + drivers/media/platform/vivid/vivid-osd.h | 27 + + drivers/media/platform/vivid/vivid-radio-common.c | 189 + + drivers/media/platform/vivid/vivid-radio-common.h | 40 + + drivers/media/platform/vivid/vivid-radio-rx.c | 287 ++ + drivers/media/platform/vivid/vivid-radio-rx.h | 31 + + drivers/media/platform/vivid/vivid-radio-tx.c | 141 + + drivers/media/platform/vivid/vivid-radio-tx.h | 29 + + drivers/media/platform/vivid/vivid-rds-gen.c | 166 + + drivers/media/platform/vivid/vivid-rds-gen.h | 53 + + drivers/media/platform/vivid/vivid-sdr-cap.c | 499 +++ + drivers/media/platform/vivid/vivid-sdr-cap.h | 34 + + drivers/media/platform/vivid/vivid-tpg-colors.c | 310 ++ + drivers/media/platform/vivid/vivid-tpg-colors.h | 64 + + drivers/media/platform/vivid/vivid-tpg.c | 1439 +++++++ + drivers/media/platform/vivid/vivid-tpg.h | 439 +++ + drivers/media/platform/vivid/vivid-vbi-cap.c | 371 ++ + drivers/media/platform/vivid/vivid-vbi-cap.h | 40 + + drivers/media/platform/vivid/vivid-vbi-gen.c | 323 ++ + drivers/media/platform/vivid/vivid-vbi-gen.h | 33 + + drivers/media/platform/vivid/vivid-vbi-out.c | 248 ++ + drivers/media/platform/vivid/vivid-vbi-out.h | 34 + + drivers/media/platform/vivid/vivid-vid-cap.c | 1730 +++++++++ + drivers/media/platform/vivid/vivid-vid-cap.h | 71 + + drivers/media/platform/vivid/vivid-vid-common.c | 571 +++ + drivers/media/platform/vivid/vivid-vid-common.h | 61 + + drivers/media/platform/vivid/vivid-vid-out.c | 1146 ++++++ + drivers/media/platform/vivid/vivid-vid-out.h | 56 + + drivers/media/radio/radio-gemtek.c | 2 +- + drivers/media/radio/radio-sf16fmi.c | 6 +- + drivers/media/radio/radio-sf16fmr2.c | 4 +- + drivers/media/radio/radio-tea5764.c | 12 +- + drivers/media/radio/si470x/radio-si470x-common.c | 4 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 4 +- + drivers/media/radio/wl128x/fmdrv_common.c | 11 +- + drivers/media/radio/wl128x/fmdrv_rx.c | 10 +- + drivers/media/radio/wl128x/fmdrv_tx.c | 2 +- + drivers/media/rc/Kconfig | 15 +- + drivers/media/rc/Makefile | 1 + + drivers/media/rc/ene_ir.c | 2 +- + drivers/media/rc/fintek-cir.c | 6 +- + drivers/media/rc/img-ir/img-ir-hw.c | 6 - + drivers/media/rc/img-ir/img-ir-hw.h | 6 + + drivers/media/rc/imon.c | 304 +- + drivers/media/rc/ir-hix5hd2.c | 348 ++ + drivers/media/rc/ite-cir.c | 3 +- + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-dvbsky.c | 78 + + drivers/media/rc/lirc_dev.c | 14 +- + drivers/media/rc/mceusb.c | 15 +- + drivers/media/rc/nuvoton-cir.c | 6 +- + drivers/media/rc/st_rc.c | 16 +- + drivers/media/rc/streamzap.c | 6 +- + drivers/media/tuners/Kconfig | 17 + + drivers/media/tuners/Makefile | 4 +- + drivers/media/tuners/e4000.c | 75 +- + drivers/media/tuners/it913x.c | 478 +++ + drivers/media/tuners/{tuner_it913x.h => it913x.h} | 41 +- + drivers/media/tuners/m88ts2022.c | 355 +- + drivers/media/tuners/m88ts2022_priv.h | 5 +- + drivers/media/tuners/msi001.c | 56 +- + drivers/media/tuners/mt2060.c | 3 +- + drivers/media/tuners/mt2063.c | 26 +- + drivers/media/tuners/mxl301rf.c | 349 ++ + drivers/media/tuners/mxl301rf.h | 26 + + drivers/media/tuners/mxl5005s.c | 3 +- + drivers/media/tuners/qm1d1c0042.c | 448 +++ + drivers/media/tuners/qm1d1c0042.h | 37 + + drivers/media/tuners/si2157.c | 86 +- + drivers/media/tuners/si2157.h | 2 +- + drivers/media/tuners/si2157_priv.h | 3 +- + drivers/media/tuners/tda18212.c | 272 +- + drivers/media/tuners/tda18212.h | 19 +- + drivers/media/tuners/tda18271-common.c | 19 +- + drivers/media/tuners/tda18271-priv.h | 4 +- + drivers/media/tuners/tuner-xc2028.c | 62 +- + drivers/media/tuners/tuner_it913x.c | 453 --- + drivers/media/tuners/tuner_it913x_priv.h | 78 - + drivers/media/tuners/xc4000.c | 62 +- + drivers/media/tuners/xc5000.c | 242 +- + drivers/media/usb/Kconfig | 4 +- + drivers/media/usb/Makefile | 4 +- + drivers/media/usb/airspy/airspy.c | 222 +- + drivers/{staging/media => media/usb}/as102/Kconfig | 0 + .../{staging/media => media/usb}/as102/Makefile | 3 +- + .../{staging/media => media/usb}/as102/as102_drv.c | 152 +- + .../{staging/media => media/usb}/as102/as102_drv.h | 26 +- + .../{staging/media => media/usb}/as102/as102_fw.c | 4 - + .../{staging/media => media/usb}/as102/as102_fw.h | 4 - + .../media => media/usb}/as102/as102_usb_drv.c | 53 +- + .../media => media/usb}/as102/as102_usb_drv.h | 4 - + .../{staging/media => media/usb}/as102/as10x_cmd.c | 23 +- + .../{staging/media => media/usb}/as102/as10x_cmd.h | 108 +- + .../media => media/usb}/as102/as10x_cmd_cfg.c | 9 +- + .../media => media/usb}/as102/as10x_cmd_stream.c | 4 - + .../media => media/usb}/as102/as10x_handle.h | 7 +- + drivers/media/usb/au0828/au0828-cards.c | 36 +- + drivers/media/usb/au0828/au0828-core.c | 84 +- + drivers/media/usb/au0828/au0828-dvb.c | 110 +- + drivers/media/usb/au0828/au0828-i2c.c | 15 +- + drivers/media/usb/au0828/au0828-input.c | 36 +- + drivers/media/usb/au0828/au0828-vbi.c | 4 +- + drivers/media/usb/au0828/au0828-video.c | 90 +- + drivers/media/usb/au0828/au0828.h | 34 +- + drivers/media/usb/cx231xx/cx231xx-avcore.c | 14 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 10 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 8 +- + drivers/media/usb/dvb-usb-v2/Kconfig | 7 + + drivers/media/usb/dvb-usb-v2/Makefile | 3 + + drivers/media/usb/dvb-usb-v2/af9015.c | 2 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 644 +++- + drivers/media/usb/dvb-usb-v2/af9035.h | 12 +- + drivers/media/usb/dvb-usb-v2/anysee.c | 185 +- + drivers/media/usb/dvb-usb-v2/anysee.h | 3 + + drivers/media/usb/dvb-usb-v2/dvb_usb.h | 3 + + drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 28 +- + drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c | 2 +- + drivers/media/usb/dvb-usb-v2/dvbsky.c | 460 +++ + drivers/media/usb/dvb-usb-v2/lmedm04.c | 2 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 8 +- + drivers/media/usb/dvb-usb/Kconfig | 2 +- + drivers/media/usb/dvb-usb/af9005.c | 2 +- + drivers/media/usb/dvb-usb/cxusb.c | 130 +- + drivers/media/usb/dvb-usb/cxusb.h | 4 + + drivers/media/usb/dvb-usb/dib0700_devices.c | 383 +- + drivers/media/usb/dvb-usb/dibusb-common.c | 12 +- + drivers/media/usb/dvb-usb/dw2102.c | 14 +- + drivers/media/usb/dvb-usb/opera1.c | 4 +- + drivers/media/usb/dvb-usb/pctv452e.c | 8 +- + drivers/media/usb/em28xx/em28xx-audio.c | 10 +- + drivers/media/usb/em28xx/em28xx-cards.c | 43 +- + drivers/media/usb/em28xx/em28xx-core.c | 47 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 37 +- + drivers/media/usb/em28xx/em28xx-input.c | 29 +- + drivers/media/usb/em28xx/em28xx-vbi.c | 11 - + drivers/media/usb/em28xx/em28xx-video.c | 29 +- + drivers/media/usb/em28xx/em28xx.h | 19 +- + drivers/media/usb/go7007/go7007-usb.c | 4 +- + drivers/media/usb/gspca/gspca.c | 5 +- + drivers/media/usb/gspca/gspca.h | 2 +- + drivers/media/usb/gspca/kinect.c | 12 +- + drivers/media/usb/gspca/sn9c20x.c | 12 +- + drivers/media/usb/hackrf/Kconfig | 10 + + drivers/media/usb/hackrf/Makefile | 1 + + drivers/media/usb/hackrf/hackrf.c | 1142 ++++++ + drivers/media/usb/hdpvr/hdpvr-control.c | 21 +- + drivers/media/usb/hdpvr/hdpvr-core.c | 27 +- + drivers/media/usb/msi2500/msi2500.c | 174 +- + drivers/media/usb/pwc/pwc-v4l.c | 2 +- + drivers/media/usb/s2255/s2255drv.c | 2 +- + drivers/media/usb/siano/smsusb.c | 6 +- + drivers/media/usb/ttusb-dec/ttusbdecfe.c | 3 + + drivers/media/usb/usbtv/Kconfig | 3 +- + drivers/media/usb/usbtv/Makefile | 3 +- + drivers/media/usb/usbtv/usbtv-audio.c | 385 ++ + drivers/media/usb/usbtv/usbtv-core.c | 17 +- + drivers/media/usb/usbtv/usbtv-video.c | 18 +- + drivers/media/usb/usbtv/usbtv.h | 21 +- + drivers/media/usb/uvc/uvc_ctrl.c | 60 +- + drivers/media/usb/uvc/uvc_driver.c | 20 +- + drivers/media/usb/uvc/uvc_v4l2.c | 1 + + drivers/media/usb/uvc/uvc_video.c | 10 +- + drivers/media/usb/uvc/uvcvideo.h | 5 +- + drivers/media/v4l2-core/tuner-core.c | 10 +- + drivers/media/v4l2-core/v4l2-common.c | 9 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 30 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 6 + + drivers/media/v4l2-core/v4l2-dv-timings.c | 3 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 6 +- + drivers/media/v4l2-core/v4l2-subdev.c | 9 + + drivers/media/v4l2-core/videobuf-core.c | 11 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 6 +- + drivers/media/v4l2-core/videobuf2-core.c | 66 +- + drivers/staging/media/Kconfig | 2 - + drivers/staging/media/Makefile | 1 - + drivers/staging/media/as102/as102_fe.c | 571 --- + drivers/staging/media/davinci_vpfe/Kconfig | 1 + + drivers/staging/media/dt3155v4l/Kconfig | 1 + + drivers/staging/media/lirc/lirc_imon.c | 1 + + drivers/staging/media/lirc/lirc_sasem.c | 1 + + drivers/staging/media/omap4iss/Kconfig | 1 + + include/media/davinci/dm644x_ccdc.h | 2 +- + include/media/omap3isp.h | 3 + + include/media/rc-map.h | 1 + + include/media/videobuf2-core.h | 15 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/smiapp.h | 29 + + include/uapi/linux/v4l2-controls.h | 6 + + include/uapi/linux/v4l2-dv-timings.h | 9 - + include/uapi/linux/videodev2.h | 13 +- + 474 files changed, 36280 insertions(+), 13108 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/hix5hd2-ir.txt + create mode 100644 Documentation/video4linux/vivid.txt + create mode 100644 drivers/media/dvb-frontends/as102_fe.c + create mode 100644 drivers/media/dvb-frontends/as102_fe.h + rename drivers/{staging/media/as102/as10x_types.h => media/dvb-frontends/as102_fe_types.h} (95%) + create mode 100644 drivers/media/dvb-frontends/sp2.c + create mode 100644 drivers/media/dvb-frontends/sp2.h + create mode 100644 drivers/media/dvb-frontends/sp2_priv.h + create mode 100644 drivers/media/dvb-frontends/tc90522.c + create mode 100644 drivers/media/dvb-frontends/tc90522.h + create mode 100644 drivers/media/pci/pt3/Kconfig + create mode 100644 drivers/media/pci/pt3/Makefile + create mode 100644 drivers/media/pci/pt3/pt3.c + create mode 100644 drivers/media/pci/pt3/pt3.h + create mode 100644 drivers/media/pci/pt3/pt3_dma.c + create mode 100644 drivers/media/pci/pt3/pt3_i2c.c + create mode 100644 drivers/media/pci/saa7134/saa7134-go7007.c + create mode 100644 drivers/media/pci/tw68/Kconfig + create mode 100644 drivers/media/pci/tw68/Makefile + create mode 100644 drivers/media/pci/tw68/tw68-core.c + create mode 100644 drivers/media/pci/tw68/tw68-reg.h + create mode 100644 drivers/media/pci/tw68/tw68-risc.c + create mode 100644 drivers/media/pci/tw68/tw68-video.c + create mode 100644 drivers/media/pci/tw68/tw68.h + delete mode 100644 drivers/media/platform/coda.c + create mode 100644 drivers/media/platform/coda/Makefile + create mode 100644 drivers/media/platform/coda/coda-bit.c + create mode 100644 drivers/media/platform/coda/coda-common.c + create mode 100644 drivers/media/platform/coda/coda-h264.c + create mode 100644 drivers/media/platform/coda/coda.h + rename drivers/media/platform/{coda.h => coda/coda_regs.h} (100%) + delete mode 100644 drivers/media/platform/vivi.c + create mode 100644 drivers/media/platform/vivid/Kconfig + create mode 100644 drivers/media/platform/vivid/Makefile + create mode 100644 drivers/media/platform/vivid/vivid-core.c + create mode 100644 drivers/media/platform/vivid/vivid-core.h + create mode 100644 drivers/media/platform/vivid/vivid-ctrls.c + create mode 100644 drivers/media/platform/vivid/vivid-ctrls.h + create mode 100644 drivers/media/platform/vivid/vivid-kthread-cap.c + create mode 100644 drivers/media/platform/vivid/vivid-kthread-cap.h + create mode 100644 drivers/media/platform/vivid/vivid-kthread-out.c + create mode 100644 drivers/media/platform/vivid/vivid-kthread-out.h + create mode 100644 drivers/media/platform/vivid/vivid-osd.c + create mode 100644 drivers/media/platform/vivid/vivid-osd.h + create mode 100644 drivers/media/platform/vivid/vivid-radio-common.c + create mode 100644 drivers/media/platform/vivid/vivid-radio-common.h + create mode 100644 drivers/media/platform/vivid/vivid-radio-rx.c + create mode 100644 drivers/media/platform/vivid/vivid-radio-rx.h + create mode 100644 drivers/media/platform/vivid/vivid-radio-tx.c + create mode 100644 drivers/media/platform/vivid/vivid-radio-tx.h + create mode 100644 drivers/media/platform/vivid/vivid-rds-gen.c + create mode 100644 drivers/media/platform/vivid/vivid-rds-gen.h + create mode 100644 drivers/media/platform/vivid/vivid-sdr-cap.c + create mode 100644 drivers/media/platform/vivid/vivid-sdr-cap.h + create mode 100644 drivers/media/platform/vivid/vivid-tpg-colors.c + create mode 100644 drivers/media/platform/vivid/vivid-tpg-colors.h + create mode 100644 drivers/media/platform/vivid/vivid-tpg.c + create mode 100644 drivers/media/platform/vivid/vivid-tpg.h + create mode 100644 drivers/media/platform/vivid/vivid-vbi-cap.c + create mode 100644 drivers/media/platform/vivid/vivid-vbi-cap.h + create mode 100644 drivers/media/platform/vivid/vivid-vbi-gen.c + create mode 100644 drivers/media/platform/vivid/vivid-vbi-gen.h + create mode 100644 drivers/media/platform/vivid/vivid-vbi-out.c + create mode 100644 drivers/media/platform/vivid/vivid-vbi-out.h + create mode 100644 drivers/media/platform/vivid/vivid-vid-cap.c + create mode 100644 drivers/media/platform/vivid/vivid-vid-cap.h + create mode 100644 drivers/media/platform/vivid/vivid-vid-common.c + create mode 100644 drivers/media/platform/vivid/vivid-vid-common.h + create mode 100644 drivers/media/platform/vivid/vivid-vid-out.c + create mode 100644 drivers/media/platform/vivid/vivid-vid-out.h + create mode 100644 drivers/media/rc/ir-hix5hd2.c + create mode 100644 drivers/media/rc/keymaps/rc-dvbsky.c + create mode 100644 drivers/media/tuners/it913x.c + rename drivers/media/tuners/{tuner_it913x.h => it913x.h} (67%) + create mode 100644 drivers/media/tuners/mxl301rf.c + create mode 100644 drivers/media/tuners/mxl301rf.h + create mode 100644 drivers/media/tuners/qm1d1c0042.c + create mode 100644 drivers/media/tuners/qm1d1c0042.h + delete mode 100644 drivers/media/tuners/tuner_it913x.c + delete mode 100644 drivers/media/tuners/tuner_it913x_priv.h + rename drivers/{staging/media => media/usb}/as102/Kconfig (100%) + rename drivers/{staging/media => media/usb}/as102/Makefile (65%) + rename drivers/{staging/media => media/usb}/as102/as102_drv.c (66%) + rename drivers/{staging/media => media/usb}/as102/as102_drv.h (75%) + rename drivers/{staging/media => media/usb}/as102/as102_fw.c (96%) + rename drivers/{staging/media => media/usb}/as102/as102_fw.h (83%) + rename drivers/{staging/media => media/usb}/as102/as102_usb_drv.c (90%) + rename drivers/{staging/media => media/usb}/as102/as102_usb_drv.h (90%) + rename drivers/{staging/media => media/usb}/as102/as10x_cmd.c (92%) + rename drivers/{staging/media => media/usb}/as102/as10x_cmd.h (89%) + rename drivers/{staging/media => media/usb}/as102/as10x_cmd_cfg.c (93%) + rename drivers/{staging/media => media/usb}/as102/as10x_cmd_stream.c (96%) + rename drivers/{staging/media => media/usb}/as102/as10x_handle.h (88%) + create mode 100644 drivers/media/usb/dvb-usb-v2/dvbsky.c + create mode 100644 drivers/media/usb/hackrf/Kconfig + create mode 100644 drivers/media/usb/hackrf/Makefile + create mode 100644 drivers/media/usb/hackrf/hackrf.c + create mode 100644 drivers/media/usb/usbtv/usbtv-audio.c + delete mode 100644 drivers/staging/media/as102/as102_fe.c + create mode 100644 include/uapi/linux/smiapp.h +Merging kbuild/for-next (e9f717fb534c Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Resolved 'arch/arm/mach-at91/Makefile' using previous resolution. +Resolved 'scripts/tags.sh' using previous resolution. +Auto-merging scripts/tags.sh +CONFLICT (content): Merge conflict in scripts/tags.sh +Auto-merging scripts/kconfig/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/gcov/Kconfig +Auto-merging init/Kconfig +Auto-merging drivers/clk/shmobile/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/Makefile +Auto-merging arch/arm/plat-samsung/Makefile +Auto-merging arch/arm/mach-exynos/Makefile +Auto-merging arch/arm/mach-at91/Makefile +CONFLICT (content): Merge conflict in arch/arm/mach-at91/Makefile +Auto-merging arch/arm/Makefile +Auto-merging Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 52b1143b4aaa] Merge remote-tracking branch 'kbuild/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kbuild/makefiles.txt | 94 ++++++--------- + Documentation/lto-build | 173 ++++++++++++++++++++++++++ + Makefile | 107 +++++++++-------- + arch/arm/Makefile | 2 - + arch/arm/mach-at91/Makefile | 3 - + arch/arm/mach-ebsa110/Makefile | 3 - + arch/arm/mach-ep93xx/Makefile | 3 - + arch/arm/mach-exynos/Makefile | 5 - + arch/arm/mach-footbridge/Makefile | 3 - + arch/arm/mach-iop13xx/Makefile | 5 - + arch/arm/mach-iop32x/Makefile | 3 - + arch/arm/mach-iop33x/Makefile | 3 - + arch/arm/mach-ks8695/Makefile | 3 - + arch/arm/mach-rpc/Makefile | 4 - + arch/arm/mach-s3c24xx/Makefile | 5 - + arch/arm/mach-s3c64xx/Makefile | 5 - + arch/arm/mach-s5pv210/Makefile | 5 - + arch/arm/mach-sa1100/Makefile | 3 - + arch/arm/mach-u300/Makefile | 3 - + arch/arm/plat-iop/Makefile | 6 - + arch/arm/plat-omap/Makefile | 3 - + arch/arm/plat-samsung/Makefile | 5 - + arch/arm64/Makefile | 2 - + arch/x86/Kconfig | 2 +- + drivers/clk/shmobile/Makefile | 2 - + drivers/net/wimax/Makefile | 4 - + firmware/Makefile | 2 +- + init/Kconfig | 73 +++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Kbuild.include | 4 +- + scripts/Makefile.build | 14 +-- + scripts/Makefile.clean | 6 +- + scripts/Makefile.fwinst | 2 +- + scripts/Makefile.host | 6 +- + scripts/Makefile.lib | 9 ++ + scripts/Makefile.lto | 84 +++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/bootgraph.pl | 0 + scripts/coccinelle/misc/simple_return.cocci | 180 ++++++++++++++++++++++++++++ + scripts/export_report.pl | 0 + scripts/gcc-goto.sh | 0 + scripts/gcc-ld | 0 + scripts/gcc-version.sh | 0 + scripts/gcc-x86_32-has-stack-protector.sh | 0 + scripts/gcc-x86_64-has-stack-protector.sh | 0 + scripts/gen_initramfs_list.sh | 0 + scripts/headers_check.pl | 0 + scripts/headers_install.sh | 0 + scripts/kconfig/Makefile | 38 +----- + scripts/kconfig/lxdialog/check-lxdialog.sh | 6 +- + scripts/kconfig/lxdialog/dialog.h | 2 +- + scripts/kconfig/streamline_config.pl | 0 + scripts/link-vmlinux.sh | 2 +- + scripts/markup_oops.pl | 0 + scripts/mkmakefile | 0 + scripts/mksysmap | 0 + scripts/package/builddeb | 26 ++-- + scripts/package/buildtar | 0 + scripts/profile2linkerlist.pl | 0 + scripts/rt-tester/rt-tester.py | 0 + scripts/selinux/install_policy.sh | 0 + scripts/tags.sh | 10 +- + scripts/tracing/draw_functrace.py | 0 + scripts/xz_wrap.sh | 0 + 65 files changed, 660 insertions(+), 271 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto + mode change 100644 => 100755 scripts/bootgraph.pl + create mode 100644 scripts/coccinelle/misc/simple_return.cocci + mode change 100644 => 100755 scripts/export_report.pl + mode change 100644 => 100755 scripts/gcc-goto.sh + mode change 100644 => 100755 scripts/gcc-ld + mode change 100644 => 100755 scripts/gcc-version.sh + mode change 100644 => 100755 scripts/gcc-x86_32-has-stack-protector.sh + mode change 100644 => 100755 scripts/gcc-x86_64-has-stack-protector.sh + mode change 100644 => 100755 scripts/gen_initramfs_list.sh + mode change 100644 => 100755 scripts/headers_check.pl + mode change 100644 => 100755 scripts/headers_install.sh + mode change 100644 => 100755 scripts/kconfig/lxdialog/check-lxdialog.sh + mode change 100644 => 100755 scripts/kconfig/streamline_config.pl + mode change 100644 => 100755 scripts/link-vmlinux.sh + mode change 100644 => 100755 scripts/markup_oops.pl + mode change 100644 => 100755 scripts/mkmakefile + mode change 100644 => 100755 scripts/mksysmap + mode change 100644 => 100755 scripts/package/builddeb + mode change 100644 => 100755 scripts/package/buildtar + mode change 100644 => 100755 scripts/profile2linkerlist.pl + mode change 100644 => 100755 scripts/rt-tester/rt-tester.py + mode change 100644 => 100755 scripts/selinux/install_policy.sh + mode change 100644 => 100755 scripts/tracing/draw_functrace.py + mode change 100644 => 100755 scripts/xz_wrap.sh +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 (8ccee3cf7d8e Merge branch 'for-3.18' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/qcom-sata.txt | 48 +++++ + arch/blackfin/mach-bf537/boards/cm_bf537e.c | 3 +- + arch/blackfin/mach-bf537/boards/cm_bf537u.c | 3 +- + arch/blackfin/mach-bf537/boards/stamp.c | 3 +- + arch/blackfin/mach-bf537/boards/tcm_bf537.c | 3 +- + arch/blackfin/mach-bf561/boards/cm_bf561.c | 3 +- + drivers/ata/acard-ahci.c | 3 +- + drivers/ata/ahci.c | 82 +-------- + drivers/ata/ahci.h | 10 +- + drivers/ata/ahci_platform.c | 18 +- + drivers/ata/ahci_xgene.c | 10 +- + drivers/ata/libahci.c | 195 ++++++++++++++------- + drivers/ata/libahci_platform.c | 32 +--- + drivers/ata/libata-core.c | 41 ++--- + drivers/ata/libata-sff.c | 20 +-- + drivers/ata/pata_imx.c | 9 +- + drivers/ata/pata_of_platform.c | 24 +-- + drivers/ata/pata_platform.c | 4 +- + drivers/ata/pata_serverworks.c | 13 +- + drivers/ata/sata_highbank.c | 3 +- + include/linux/ahci_platform.h | 13 -- + include/linux/ata_platform.h | 5 - + include/linux/libata.h | 12 +- + 23 files changed, 259 insertions(+), 298 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/qcom-sata.txt +Merging pm/linux-next (9f1a05329695 Merge branch 'pm-clk') +$ git merge pm/linux-next +Resolved 'arch/arm/configs/mvebu_v7_defconfig' using previous resolution. +Resolved 'arch/arm/mach-shmobile/board-ape6evm-reference.c' using previous resolution. +Resolved 'arch/arm/mach-shmobile/setup-sh73a0.c' using previous resolution. +Auto-merging include/linux/irqdesc.h +Auto-merging drivers/spi/spi.c +Auto-merging drivers/cpuidle/Kconfig.arm +Removing drivers/cpufreq/cpufreq-cpu0.c +Auto-merging drivers/cpufreq/Kconfig.arm +Auto-merging drivers/acpi/acpi_pnp.c +Auto-merging arch/arm/mach-zynq/common.c +Auto-merging arch/arm/mach-shmobile/setup-sh73a0.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-sh73a0.c +Auto-merging arch/arm/mach-shmobile/pm-rmobile.c +Auto-merging arch/arm/mach-shmobile/board-ape6evm-reference.c +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ape6evm-reference.c +Auto-merging arch/arm/mach-exynos/exynos.c +Auto-merging arch/arm/configs/mvebu_v7_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/mvebu_v7_defconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 966338c10802] Merge remote-tracking branch 'pm/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/arm/exynos/power_domain.txt | 13 +- + .../cpufreq/{cpufreq-cpu0.txt => cpufreq-dt.txt} | 8 +- + .../devicetree/bindings/power/power_domain.txt | 49 ++ + .../bindings/power/rockchip-io-domain.txt | 83 ++ + Documentation/kernel-parameters.txt | 10 +- + Documentation/power/suspend-and-interrupts.txt | 123 +++ + MAINTAINERS | 4 +- + arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 23 + + arch/arm/configs/mvebu_v7_defconfig | 1 + + arch/arm/mach-exynos/exynos.c | 1 - + arch/arm/mach-exynos/pm_domains.c | 78 +- + arch/arm/mach-imx/imx27-dt.c | 2 +- + arch/arm/mach-imx/mach-imx51.c | 2 +- + arch/arm/mach-mvebu/pmsu.c | 2 +- + arch/arm/mach-omap2/pm.c | 2 +- + arch/arm/mach-s3c64xx/common.c | 5 - + arch/arm/mach-s3c64xx/common.h | 7 - + arch/arm/mach-s3c64xx/mach-anw6410.c | 1 - + arch/arm/mach-s3c64xx/mach-crag6410.c | 1 - + arch/arm/mach-s3c64xx/mach-hmt.c | 1 - + arch/arm/mach-s3c64xx/mach-mini6410.c | 1 - + arch/arm/mach-s3c64xx/mach-ncp.c | 1 - + arch/arm/mach-s3c64xx/mach-real6410.c | 1 - + arch/arm/mach-s3c64xx/mach-smartq5.c | 1 - + arch/arm/mach-s3c64xx/mach-smartq7.c | 1 - + arch/arm/mach-s3c64xx/mach-smdk6400.c | 1 - + arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 - + arch/arm/mach-s3c64xx/pm.c | 7 - + arch/arm/mach-shmobile/cpufreq.c | 2 +- + arch/arm/mach-shmobile/pm-r8a7779.c | 1 - + arch/arm/mach-shmobile/pm-rmobile.c | 1 - + arch/arm/mach-zynq/common.c | 2 +- + arch/x86/kernel/apic/io_apic.c | 5 + + drivers/acpi/acpi_lpss.c | 167 ++-- + drivers/acpi/acpi_pnp.c | 4 - + drivers/acpi/acpica/evxfgpe.c | 32 + + drivers/acpi/acpica/hwgpe.c | 8 +- + drivers/acpi/acpica/utresrc.c | 4 +- + drivers/acpi/battery.c | 2 +- + drivers/acpi/blacklist.c | 36 +- + drivers/acpi/device_pm.c | 71 +- + drivers/acpi/fan.c | 18 +- + drivers/acpi/osl.c | 12 +- + drivers/acpi/pci_root.c | 14 + + drivers/acpi/processor_core.c | 6 +- + drivers/acpi/sbs.c | 80 +- + drivers/acpi/sleep.c | 16 + + drivers/acpi/utils.c | 1 - + drivers/acpi/video.c | 291 +------ + drivers/acpi/video_detect.c | 8 + + drivers/amba/bus.c | 11 +- + drivers/base/platform.c | 16 +- + drivers/base/power/clock_ops.c | 19 +- + drivers/base/power/common.c | 52 ++ + drivers/base/power/domain.c | 865 ++++++++++++--------- + drivers/base/power/domain_governor.c | 7 +- + drivers/base/power/main.c | 8 +- + drivers/base/power/sysfs.c | 24 +- + drivers/base/power/wakeup.c | 16 +- + drivers/base/syscore.c | 7 +- + drivers/cpufreq/Kconfig | 8 +- + drivers/cpufreq/Kconfig.arm | 2 +- + drivers/cpufreq/Makefile | 2 +- + drivers/cpufreq/cpufreq-cpu0.c | 248 ------ + drivers/cpufreq/cpufreq-dt.c | 364 +++++++++ + drivers/cpufreq/cpufreq.c | 8 +- + drivers/cpufreq/exynos4210-cpufreq.c | 2 +- + drivers/cpufreq/exynos4x12-cpufreq.c | 2 +- + drivers/cpufreq/exynos5250-cpufreq.c | 2 +- + drivers/cpufreq/highbank-cpufreq.c | 6 +- + drivers/cpufreq/powernv-cpufreq.c | 44 ++ + drivers/cpufreq/ppc-corenet-cpufreq.c | 1 - + drivers/cpufreq/s5pv210-cpufreq.c | 2 +- + drivers/cpuidle/Kconfig | 8 + + drivers/cpuidle/Kconfig.arm | 1 + + drivers/cpuidle/Kconfig.arm64 | 14 + + drivers/cpuidle/Makefile | 5 + + drivers/cpuidle/cpuidle-arm64.c | 133 ++++ + drivers/cpuidle/cpuidle-big_little.c | 20 + + drivers/cpuidle/dt_idle_states.c | 213 +++++ + drivers/cpuidle/dt_idle_states.h | 7 + + drivers/cpuidle/governor.c | 2 +- + drivers/devfreq/Kconfig | 3 +- + drivers/devfreq/devfreq.c | 3 + + drivers/devfreq/exynos/exynos_ppmu.c | 3 + + drivers/i2c/i2c-core.c | 14 +- + drivers/mmc/core/sdio_bus.c | 5 +- + drivers/pci/pcie/pme.c | 61 +- + drivers/platform/x86/fujitsu-laptop.c | 16 +- + drivers/power/avs/Kconfig | 8 + + drivers/power/avs/Makefile | 1 + + drivers/power/avs/rockchip-io-domain.c | 351 +++++++++ + drivers/sh/pm_runtime.c | 11 - + drivers/spi/spi.c | 13 +- + include/acpi/acnames.h | 4 + + include/acpi/acpixf.h | 3 +- + include/acpi/actbl1.h | 19 +- + include/acpi/actbl3.h | 9 +- + include/linux/acpi.h | 2 - + include/linux/cpufreq.h | 3 + + include/linux/interrupt.h | 5 - + include/linux/irq.h | 8 + + include/linux/irqdesc.h | 10 + + include/linux/pm.h | 5 + + include/linux/pm_domain.h | 130 ++-- + include/linux/suspend.h | 6 + + kernel/irq/chip.c | 85 +- + kernel/irq/internals.h | 16 +- + kernel/irq/manage.c | 32 +- + kernel/irq/pm.c | 159 ++-- + kernel/power/Kconfig | 4 + + kernel/power/process.c | 1 + + kernel/power/snapshot.c | 54 +- + kernel/power/suspend.c | 51 +- + kernel/power/suspend_test.c | 32 +- + 115 files changed, 2973 insertions(+), 1484 deletions(-) + rename Documentation/devicetree/bindings/cpufreq/{cpufreq-cpu0.txt => cpufreq-dt.txt} (85%) + create mode 100644 Documentation/devicetree/bindings/power/power_domain.txt + create mode 100644 Documentation/devicetree/bindings/power/rockchip-io-domain.txt + create mode 100644 Documentation/power/suspend-and-interrupts.txt + delete mode 100644 drivers/cpufreq/cpufreq-cpu0.c + create mode 100644 drivers/cpufreq/cpufreq-dt.c + create mode 100644 drivers/cpuidle/Kconfig.arm64 + create mode 100644 drivers/cpuidle/cpuidle-arm64.c + create mode 100644 drivers/cpuidle/dt_idle_states.c + create mode 100644 drivers/cpuidle/dt_idle_states.h + create mode 100644 drivers/power/avs/rockchip-io-domain.c +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 (0ccda9cb8760 Merge branches 'thermal-core-fix' and 'int340x-thermal' of .git into next) +$ git merge thermal/next +Recorded preimage for 'drivers/acpi/fan.c' +Auto-merging include/linux/acpi.h +Auto-merging include/acpi/acpi_bus.h +Removing drivers/thermal/int3403_thermal.c +Auto-merging drivers/thermal/Kconfig +Auto-merging drivers/acpi/video.c +Auto-merging drivers/acpi/utils.c +Auto-merging drivers/acpi/scan.c +Auto-merging drivers/acpi/fan.c +CONFLICT (content): Merge conflict in drivers/acpi/fan.c +Auto-merging drivers/acpi/device_pm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/acpi/fan.c'. +[master 2cd04a0d8973] Merge remote-tracking branch 'thermal/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/thermal/imx-thermal.txt | 5 +- + drivers/acpi/Kconfig | 2 +- + drivers/acpi/Makefile | 1 + + drivers/acpi/acpi_platform.c | 1 + + drivers/acpi/device_pm.c | 1 + + drivers/acpi/fan.c | 338 +++++++++++--- + drivers/acpi/int340x_thermal.c | 51 +++ + drivers/acpi/internal.h | 10 +- + drivers/acpi/scan.c | 1 + + drivers/acpi/thermal.c | 18 +- + drivers/acpi/utils.c | 28 +- + drivers/acpi/video.c | 78 ++-- + drivers/thermal/Kconfig | 49 ++- + drivers/thermal/Makefile | 3 +- + drivers/thermal/fair_share.c | 12 + + drivers/thermal/gov_bang_bang.c | 131 ++++++ + drivers/thermal/imx_thermal.c | 91 +++- + drivers/thermal/int3403_thermal.c | 296 ------------- + drivers/thermal/int340x_thermal/Makefile | 5 + + drivers/thermal/int340x_thermal/acpi_thermal_rel.c | 400 +++++++++++++++++ + drivers/thermal/int340x_thermal/acpi_thermal_rel.h | 84 ++++ + drivers/thermal/int340x_thermal/int3400_thermal.c | 271 ++++++++++++ + drivers/thermal/int340x_thermal/int3402_thermal.c | 242 ++++++++++ + drivers/thermal/int340x_thermal/int3403_thermal.c | 489 +++++++++++++++++++++ + drivers/thermal/int340x_thermal/int3406_thermal.c | 230 ++++++++++ + drivers/thermal/of-thermal.c | 12 + + drivers/thermal/step_wise.c | 7 +- + drivers/thermal/thermal_core.c | 12 + + drivers/thermal/thermal_core.h | 8 + + drivers/video/backlight/backlight.c | 44 +- + include/acpi/acpi_bus.h | 1 + + include/acpi/video.h | 20 + + include/linux/acpi.h | 7 + + include/linux/backlight.h | 2 + + include/linux/thermal.h | 4 + + include/trace/events/thermal.h | 83 ++++ + 36 files changed, 2564 insertions(+), 473 deletions(-) + create mode 100644 drivers/acpi/int340x_thermal.c + create mode 100644 drivers/thermal/gov_bang_bang.c + delete mode 100644 drivers/thermal/int3403_thermal.c + create mode 100644 drivers/thermal/int340x_thermal/Makefile + create mode 100644 drivers/thermal/int340x_thermal/acpi_thermal_rel.c + create mode 100644 drivers/thermal/int340x_thermal/acpi_thermal_rel.h + create mode 100644 drivers/thermal/int340x_thermal/int3400_thermal.c + create mode 100644 drivers/thermal/int340x_thermal/int3402_thermal.c + create mode 100644 drivers/thermal/int340x_thermal/int3403_thermal.c + create mode 100644 drivers/thermal/int340x_thermal/int3406_thermal.c + create mode 100644 include/trace/events/thermal.h +$ git reset --hard HEAD^ +HEAD is now at 966338c10802 Merge remote-tracking branch 'pm/linux-next' +Merging next-20141009 version of thermal +$ git merge -m next-20141009/thermal dd634666793e51b43b703161302310326c259d50 +Auto-merging drivers/thermal/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/imx-thermal.txt | 5 +- + drivers/thermal/Kconfig | 10 ++ + drivers/thermal/Makefile | 1 + + drivers/thermal/fair_share.c | 12 ++ + drivers/thermal/gov_bang_bang.c | 131 +++++++++++++++++++++ + drivers/thermal/imx_thermal.c | 91 ++++++++++++-- + drivers/thermal/of-thermal.c | 12 ++ + drivers/thermal/step_wise.c | 5 +- + drivers/thermal/thermal_core.c | 12 ++ + drivers/thermal/thermal_core.h | 8 ++ + include/trace/events/thermal.h | 83 +++++++++++++ + 11 files changed, 355 insertions(+), 15 deletions(-) + create mode 100644 drivers/thermal/gov_bang_bang.c + create mode 100644 include/trace/events/thermal.h +Merging ieee1394/for-next (d584a6627994 firewire: ohci: disable MSI for VIA VT6315 again) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode) +$ 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 (ade4a2a8e6e4 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Resolved 'drivers/tty/serial/8250/8250_pci.c' using previous resolution. +Auto-merging include/linux/platform_data/dma-dw.h +Auto-merging include/linux/dmaengine.h +Auto-merging drivers/tty/serial/8250/8250_pci.c +CONFLICT (content): Merge conflict in drivers/tty/serial/8250/8250_pci.c +Auto-merging drivers/tty/serial/8250/8250.h +Auto-merging drivers/spi/spi-pxa2xx-pci.c +Auto-merging drivers/dma/mv_xor.c +Auto-merging drivers/dma/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b45d08b1a71b] Merge remote-tracking branch 'slave-dma/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/dma/qcom_adm.txt | 62 +++++ + .../devicetree/bindings/dma/xilinx/xilinx_dma.txt | 65 +++++ + Documentation/dmaengine.txt | 4 +- + MAINTAINERS | 2 +- + arch/avr32/mach-at32ap/at32ap700x.c | 19 +- + arch/avr32/mach-at32ap/include/mach/atmel-mci.h | 2 +- + drivers/dma/Kconfig | 2 +- + drivers/dma/dw/core.c | 72 ++---- + drivers/dma/dw/internal.h | 28 +-- + drivers/dma/dw/pci.c | 4 + + drivers/dma/dw/platform.c | 86 ++++--- + drivers/dma/dw/regs.h | 14 +- + drivers/dma/imx-sdma.c | 35 ++- + drivers/dma/mmp_tdma.c | 19 +- + drivers/dma/mv_xor.c | 268 ++++++++------------- + drivers/dma/mv_xor.h | 62 +++-- + drivers/dma/sh/rcar-audmapp.c | 15 +- + drivers/dma/sun6i-dma.c | 23 -- + drivers/dma/xilinx/xilinx_vdma.c | 1 - + drivers/spi/spi-pxa2xx-dma.c | 15 +- + drivers/spi/spi-pxa2xx-pci.c | 101 ++++++-- + drivers/spi/spi-pxa2xx.c | 2 - + drivers/tty/serial/8250/8250.h | 6 +- + drivers/tty/serial/8250/8250_dw.c | 7 +- + drivers/tty/serial/8250/8250_pci.c | 78 +++++- + include/linux/dmaengine.h | 4 +- + .../linux/{dw_dmac.h => platform_data/dma-dw.h} | 10 +- + include/linux/spi/pxa2xx_spi.h | 9 +- + include/sound/atmel-abdac.h | 2 +- + include/sound/atmel-ac97c.h | 2 +- + sound/atmel/abdac.c | 2 +- + sound/atmel/ac97c.c | 2 +- + sound/soc/pxa/mmp-pcm.c | 3 +- + 33 files changed, 569 insertions(+), 457 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/qcom_adm.txt + create mode 100644 Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt + rename include/linux/{dw_dmac.h => platform_data/dma-dw.h} (92%) +Merging net-next/master (64b1f00a0830 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (689f1c9de2ab ipsec: Remove obsolete MAX_AH_AUTH_LEN) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-next/master (1fca350b7616 rtlwifi: Fix possible unaligned array in ether_addr_copy()) +$ git merge wireless-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath9k/ath9k.h | 4 ++- + drivers/net/wireless/ath/ath9k/beacon.c | 12 ++------- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 + + drivers/net/wireless/ath/ath9k/main.c | 2 +- + drivers/net/wireless/ath/ath9k/tx99.c | 8 +++++- + drivers/net/wireless/ath/ath9k/xmit.c | 34 +++++++++++++++++-------- + drivers/net/wireless/ath/main.c | 8 +++--- + drivers/net/wireless/rtl818x/rtl8180/dev.c | 36 +++++++++++++++++++-------- + drivers/net/wireless/rtlwifi/wifi.h | 2 +- + net/rfkill/core.c | 4 +-- + 10 files changed, 69 insertions(+), 42 deletions(-) +Merging bluetooth/master (2d6d9249c235 Bluetooth: Remove redundant check on hci_conn's device class) +$ git merge bluetooth/master +Auto-merging net/ieee802154/reassembly.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/ath3k.c | 2 + + drivers/bluetooth/btusb.c | 1 + + drivers/net/ieee802154/at86rf230.c | 180 +++++++++++++++++++------------------ + drivers/net/ieee802154/mrf24j40.c | 32 ++++++- + include/net/bluetooth/hci_core.h | 7 +- + net/bluetooth/hci_event.c | 46 +++++----- + net/bluetooth/l2cap_core.c | 4 +- + net/bluetooth/mgmt.c | 32 ++++--- + net/ieee802154/6lowpan_rtnl.c | 14 +-- + net/ieee802154/reassembly.c | 8 +- + net/ieee802154/reassembly.h | 4 +- + net/mac802154/Kconfig | 2 +- + 12 files changed, 194 insertions(+), 138 deletions(-) +Merging infiniband/for-next (3bdad2d13fa6 Merge branches 'core', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (b25046b1e5e3 mtd: nand: fix DocBook warnings on nand_sdr_timings doc) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (8b3d58e55445 mtd: nand: omap: Correct CONFIG_MTD_NAND_OMAP_BCH help message) +$ git merge l2-mtd/master +Auto-merging arch/arm/mach-omap2/gpmc.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/atmel-nand.txt | 2 + + .../devicetree/bindings/mtd/mtd-physmap.txt | 4 +- + MAINTAINERS | 1 + + arch/arm/mach-omap2/gpmc.c | 2 + + drivers/mtd/bcm47xxpart.c | 11 + + drivers/mtd/chips/cfi_cmdset_0002.c | 2 + + drivers/mtd/devices/Makefile | 1 - + drivers/mtd/devices/docg3.c | 26 +- + drivers/mtd/devices/m25p80.c | 22 +- + drivers/mtd/maps/Kconfig | 2 +- + drivers/mtd/maps/gpio-addr-flash.c | 42 +- + drivers/mtd/maps/pcmciamtd.c | 2 +- + drivers/mtd/maps/physmap_of.c | 6 +- + drivers/mtd/mtdchar.c | 3 + + drivers/mtd/mtdcore.c | 39 +- + drivers/mtd/mtdswap.c | 8 +- + drivers/mtd/nand/Kconfig | 7 +- + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/atmel_nand.c | 96 ++-- + drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c | 57 ++- + drivers/mtd/nand/denali.c | 565 +++++++++++---------- + drivers/mtd/nand/denali.h | 27 +- + drivers/mtd/nand/nand_base.c | 38 +- + drivers/mtd/nand/nand_bbt.c | 23 +- + drivers/mtd/nand/nand_ids.c | 4 + + drivers/mtd/nand/nand_timings.c | 2 +- + drivers/mtd/nand/nandsim.c | 2 +- + drivers/mtd/nand/ndfc.c | 3 +- + drivers/mtd/nand/omap2.c | 166 +++--- + drivers/mtd/{devices/elm.c => nand/omap_elm.c} | 0 + drivers/mtd/nand/sm_common.h | 2 +- + drivers/mtd/sm_ftl.c | 2 +- + drivers/mtd/spi-nor/Kconfig | 14 + + drivers/mtd/spi-nor/spi-nor.c | 42 +- + drivers/mtd/tests/mtd_test.c | 4 +- + drivers/mtd/tests/nandbiterrs.c | 2 +- + drivers/mtd/tests/oobtest.c | 8 +- + drivers/mtd/tests/pagetest.c | 4 +- + drivers/mtd/tests/readtest.c | 2 +- + drivers/mtd/tests/speedtest.c | 14 +- + drivers/mtd/tests/subpagetest.c | 10 +- + include/linux/mtd/cfi.h | 22 +- + include/linux/mtd/nand.h | 12 + + include/linux/platform_data/elm.h | 16 + + include/linux/platform_data/mtd-nand-omap2.h | 1 + + 45 files changed, 757 insertions(+), 562 deletions(-) + rename drivers/mtd/{devices/elm.c => nand/omap_elm.c} (100%) +Merging crypto/master (be34c4ef693f crypto: sha - Handle unaligned input data in generic sha256 and sha512.) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (1e99cfa8de0f drm/ast: Fix HW cursor image) +$ git merge drm/drm-next +Removing include/drm/drm_usb.h +Removing include/drm/drm_memory.h +Auto-merging drivers/staging/imx-drm/imx-drm-core.c +Auto-merging drivers/gpu/drm/radeon/si.c +Auto-merging drivers/gpu/drm/radeon/radeon_encoders.c +Auto-merging drivers/gpu/drm/radeon/radeon_drv.c +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Auto-merging drivers/gpu/drm/radeon/radeon_asic.h +Auto-merging drivers/gpu/drm/radeon/radeon_asic.c +Auto-merging drivers/gpu/drm/radeon/radeon.h +Auto-merging drivers/gpu/drm/radeon/r600d.h +Auto-merging drivers/gpu/drm/radeon/r600_dma.c +Removing drivers/gpu/drm/radeon/r600_audio.c +Auto-merging drivers/gpu/drm/radeon/r600.c +Auto-merging drivers/gpu/drm/radeon/r100.c +Auto-merging drivers/gpu/drm/radeon/kv_dpm.c +Auto-merging drivers/gpu/drm/radeon/evergreen.c +Auto-merging drivers/gpu/drm/radeon/drm_buffer.c +Auto-merging drivers/gpu/drm/radeon/cik_sdma.c +Auto-merging drivers/gpu/drm/radeon/cik.c +Removing drivers/gpu/drm/qxl/qxl_fence.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.h +Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_display.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_chan.c +Auto-merging drivers/gpu/drm/nouveau/core/subdev/ltc/gm107.c +Auto-merging drivers/gpu/drm/nouveau/core/subdev/ltc/gf100.c +Auto-merging drivers/gpu/drm/nouveau/core/subdev/gpio/nv94.c +Auto-merging drivers/gpu/drm/nouveau/core/engine/disp/nv50.c +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_bios.c +Auto-merging drivers/gpu/drm/i915/i915_params.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_cmd_parser.c +Removing drivers/gpu/drm/drm_usb.c +Auto-merging arch/arm/mach-shmobile/board-lager-reference.c +Auto-merging arch/arm/mach-shmobile/board-koelsch-reference.c +Auto-merging arch/arm/boot/dts/exynos3250.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 16 +- + .../devicetree/bindings/drm/tilcdc/panel.txt | 7 + + .../devicetree/bindings/panel/auo,b101xtn01.txt | 7 + + .../devicetree/bindings/vendor-prefixes.txt | 2 + + .../devicetree/bindings/video/adi,adv7123.txt | 50 + + .../devicetree/bindings/video/exynos_dsim.txt | 1 + + .../devicetree/bindings/video/renesas,du.txt | 84 + + .../devicetree/bindings/video/samsung-fimd.txt | 1 + + .../devicetree/bindings/video/thine,thc63lvdm83d | 50 + + .../devicetree/bindings/video/vga-connector.txt | 36 + + MAINTAINERS | 2 +- + arch/arm/boot/dts/exynos3250.dtsi | 33 + + arch/arm/mach-shmobile/board-koelsch-reference.c | 19 +- + arch/arm/mach-shmobile/board-koelsch.c | 19 +- + arch/arm/mach-shmobile/board-lager-reference.c | 19 +- + arch/arm/mach-shmobile/board-lager.c | 19 +- + arch/arm/mach-shmobile/board-marzen.c | 19 +- + drivers/gpu/drm/Kconfig | 8 +- + drivers/gpu/drm/Makefile | 5 +- + drivers/gpu/drm/armada/armada_drv.c | 1 + + drivers/gpu/drm/armada/armada_gem.h | 2 + + drivers/gpu/drm/ast/ast_dp501.c | 38 +- + drivers/gpu/drm/ast/ast_drv.c | 1 + + drivers/gpu/drm/ast/ast_drv.h | 12 +- + drivers/gpu/drm/ast/ast_fb.c | 3 +- + drivers/gpu/drm/ast/ast_main.c | 79 +- + drivers/gpu/drm/ast/ast_mode.c | 46 +- + drivers/gpu/drm/ast/ast_post.c | 23 +- + drivers/gpu/drm/ast/ast_tables.h | 38 +- + drivers/gpu/drm/ast/ast_ttm.c | 24 +- + drivers/gpu/drm/ati_pcigart.c | 2 + + drivers/gpu/drm/bochs/bochs.h | 4 +- + drivers/gpu/drm/bochs/bochs_drv.c | 1 + + drivers/gpu/drm/bochs/bochs_mm.c | 24 +- + drivers/gpu/drm/cirrus/cirrus_drv.c | 1 + + drivers/gpu/drm/cirrus/cirrus_drv.h | 4 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 3 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 21 +- + drivers/gpu/drm/drm_agpsupport.c | 1 + + drivers/gpu/drm/drm_auth.c | 7 + + drivers/gpu/drm/drm_bufs.c | 94 +- + drivers/gpu/drm/drm_crtc.c | 394 +++-- + drivers/gpu/drm/drm_debugfs.c | 3 +- + drivers/gpu/drm/drm_dma.c | 11 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 3 +- + drivers/gpu/drm/drm_drv.c | 40 +- + drivers/gpu/drm/drm_edid.c | 123 +- + drivers/gpu/drm/drm_fb_helper.c | 85 +- + drivers/gpu/drm/drm_fops.c | 30 +- + drivers/gpu/drm/drm_gem.c | 12 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 7 +- + drivers/gpu/drm/drm_info.c | 89 +- + drivers/gpu/drm/drm_internal.h | 132 ++ + drivers/gpu/drm/drm_ioctl.c | 254 +-- + drivers/gpu/drm/drm_irq.c | 463 +++-- + drivers/gpu/drm/drm_legacy.h | 62 + + drivers/gpu/drm/drm_lock.c | 36 +- + drivers/gpu/drm/drm_memory.c | 24 +- + drivers/gpu/drm/drm_mipi_dsi.c | 6 + + drivers/gpu/drm/drm_modes.c | 1 + + drivers/gpu/drm/drm_modeset_lock.c | 213 ++- + drivers/gpu/drm/drm_pci.c | 46 +- + drivers/gpu/drm/drm_platform.c | 38 +- + drivers/gpu/drm/drm_prime.c | 5 +- + drivers/gpu/drm/drm_probe_helper.c | 17 + + drivers/gpu/drm/drm_scatter.c | 9 +- + drivers/gpu/drm/drm_sysfs.c | 1 + + drivers/gpu/drm/drm_usb.c | 88 - + drivers/gpu/drm/drm_vm.c | 89 +- + drivers/gpu/drm/exynos/exynos_dp_core.c | 8 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 62 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 104 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 40 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 1 + + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 90 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 55 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 106 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 16 +- + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 453 ++--- + drivers/gpu/drm/exynos/exynos_drm_ipp.h | 4 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 19 +- + drivers/gpu/drm/exynos/exynos_drm_plane.h | 3 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 19 - + drivers/gpu/drm/exynos/exynos_hdmi.c | 4 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 3 - + drivers/gpu/drm/gma500/cdv_intel_dp.c | 4 +- + drivers/gpu/drm/gma500/framebuffer.c | 3 +- + drivers/gpu/drm/gma500/gtt.h | 1 + + drivers/gpu/drm/gma500/intel_bios.c | 16 +- + drivers/gpu/drm/gma500/psb_drv.c | 1 + + drivers/gpu/drm/i810/i810_dma.c | 16 +- + drivers/gpu/drm/i810/i810_drv.c | 3 +- + drivers/gpu/drm/i810/i810_drv.h | 2 + + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/dvo_ns2501.c | 560 ++++--- + drivers/gpu/drm/i915/i915_cmd_parser.c | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 370 +++- + drivers/gpu/drm/i915/i915_dma.c | 31 +- + drivers/gpu/drm/i915/i915_drv.c | 194 ++- + drivers/gpu/drm/i915/i915_drv.h | 222 ++- + drivers/gpu/drm/i915/i915_gem.c | 370 ++-- + drivers/gpu/drm/i915/i915_gem_context.c | 216 +-- + drivers/gpu/drm/i915/i915_gem_evict.c | 4 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 227 +-- + drivers/gpu/drm/i915/i915_gem_gtt.c | 291 ++-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 32 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 40 +- + drivers/gpu/drm/i915/i915_gem_render_state.h | 47 + + drivers/gpu/drm/i915/i915_gem_stolen.c | 13 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 11 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 31 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 196 ++- + drivers/gpu/drm/i915/i915_irq.c | 241 ++- + drivers/gpu/drm/i915/i915_params.c | 6 + + drivers/gpu/drm/i915/i915_reg.h | 283 +++- + drivers/gpu/drm/i915/i915_sysfs.c | 2 +- + drivers/gpu/drm/i915/intel_bios.c | 29 +- + drivers/gpu/drm/i915/intel_bios.h | 3 +- + drivers/gpu/drm/i915/intel_ddi.c | 344 ++-- + drivers/gpu/drm/i915/intel_display.c | 1312 ++++++++++----- + drivers/gpu/drm/i915/intel_dp.c | 1257 +++++++++----- + drivers/gpu/drm/i915/intel_drv.h | 38 +- + drivers/gpu/drm/i915/intel_dsi.c | 40 +- + drivers/gpu/drm/i915/intel_dsi.h | 2 + + drivers/gpu/drm/i915/intel_dsi_cmd.c | 2 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 38 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 17 +- + drivers/gpu/drm/i915/intel_dvo.c | 11 +- + drivers/gpu/drm/i915/intel_fbdev.c | 83 +- + drivers/gpu/drm/i915/intel_hdmi.c | 168 +- + drivers/gpu/drm/i915/intel_lrc.c | 1766 ++++++++++++++++++++ + drivers/gpu/drm/i915/intel_lrc.h | 114 ++ + drivers/gpu/drm/i915/intel_lvds.c | 3 +- + drivers/gpu/drm/i915/intel_panel.c | 29 +- + drivers/gpu/drm/i915/intel_pm.c | 818 ++++++--- + drivers/gpu/drm/i915/intel_renderstate.h | 8 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 256 ++- + drivers/gpu/drm/i915/intel_ringbuffer.h | 46 +- + drivers/gpu/drm/i915/intel_sprite.c | 109 +- + drivers/gpu/drm/i915/intel_uncore.c | 6 +- + drivers/gpu/drm/mga/mga_dma.c | 77 +- + drivers/gpu/drm/mga/mga_drv.c | 3 +- + drivers/gpu/drm/mga/mga_drv.h | 2 + + drivers/gpu/drm/mgag200/mgag200_drv.c | 1 + + drivers/gpu/drm/mgag200/mgag200_drv.h | 6 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 3 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 21 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 24 +- + drivers/gpu/drm/msm/Kconfig | 1 + + drivers/gpu/drm/msm/Makefile | 4 + + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 6 +- + drivers/gpu/drm/msm/adreno/a3xx.xml.h | 12 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 214 +-- + drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 6 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 285 ++++ + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 151 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 17 +- + drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 10 +- + drivers/gpu/drm/msm/dsi/dsi.xml.h | 10 +- + drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 18 +- + drivers/gpu/drm/msm/dsi/sfpb.xml.h | 10 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 4 +- + drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 10 +- + drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 10 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h | 107 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 21 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 89 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 63 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c | 506 ++++++ + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 151 ++ + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_pll.c | 172 ++ + drivers/gpu/drm/msm/msm_drv.c | 38 +- + drivers/gpu/drm/msm/msm_drv.h | 3 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 5 +- + drivers/gpu/drm/msm/msm_gpu.h | 6 +- + drivers/gpu/drm/nouveau/Makefile | 12 +- + drivers/gpu/drm/nouveau/core/core/client.c | 7 +- + drivers/gpu/drm/nouveau/core/core/event.c | 2 +- + drivers/gpu/drm/nouveau/core/core/gpuobj.c | 2 +- + drivers/gpu/drm/nouveau/core/core/ioctl.c | 3 +- + drivers/gpu/drm/nouveau/core/core/mm.c | 97 +- + drivers/gpu/drm/nouveau/core/core/notify.c | 7 +- + drivers/gpu/drm/nouveau/core/engine/device/base.c | 3 +- + drivers/gpu/drm/nouveau/core/engine/device/gm100.c | 9 +- + drivers/gpu/drm/nouveau/core/engine/device/nv50.c | 37 +- + drivers/gpu/drm/nouveau/core/engine/device/nvc0.c | 24 +- + drivers/gpu/drm/nouveau/core/engine/device/nve0.c | 8 + + drivers/gpu/drm/nouveau/core/engine/disp/base.c | 6 +- + drivers/gpu/drm/nouveau/core/engine/disp/conn.c | 4 +- + drivers/gpu/drm/nouveau/core/engine/disp/gm107.c | 6 +- + drivers/gpu/drm/nouveau/core/engine/disp/hdanva3.c | 15 +- + drivers/gpu/drm/nouveau/core/engine/disp/hdanvd0.c | 20 +- + .../gpu/drm/nouveau/core/engine/disp/hdminvd0.c | 3 - + .../gpu/drm/nouveau/core/engine/disp/hdminve0.c | 83 + + drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 129 +- + drivers/gpu/drm/nouveau/core/engine/disp/nv50.h | 10 + + drivers/gpu/drm/nouveau/core/engine/disp/nv84.c | 4 + + drivers/gpu/drm/nouveau/core/engine/disp/nv94.c | 4 + + drivers/gpu/drm/nouveau/core/engine/disp/nva0.c | 4 + + drivers/gpu/drm/nouveau/core/engine/disp/nva3.c | 4 + + drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c | 80 +- + drivers/gpu/drm/nouveau/core/engine/disp/nve0.c | 6 +- + drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c | 6 +- + drivers/gpu/drm/nouveau/core/engine/disp/outpdp.c | 4 +- + drivers/gpu/drm/nouveau/core/engine/disp/priv.h | 3 +- + drivers/gpu/drm/nouveau/core/engine/fifo/base.c | 6 +- + .../gpu/drm/nouveau/core/engine/software/nv50.c | 3 +- + drivers/gpu/drm/nouveau/core/include/core/client.h | 2 +- + drivers/gpu/drm/nouveau/core/include/core/device.h | 1 + + drivers/gpu/drm/nouveau/core/include/core/event.h | 3 +- + drivers/gpu/drm/nouveau/core/include/core/mm.h | 12 +- + drivers/gpu/drm/nouveau/core/include/core/notify.h | 5 +- + drivers/gpu/drm/nouveau/core/include/engine/fifo.h | 3 +- + drivers/gpu/drm/nouveau/core/include/subdev/bar.h | 1 - + .../drm/nouveau/core/include/subdev/bios/M0205.h | 32 + + .../drm/nouveau/core/include/subdev/bios/M0209.h | 30 + + .../gpu/drm/nouveau/core/include/subdev/bios/fan.h | 8 + + .../drm/nouveau/core/include/subdev/bios/ramcfg.h | 160 +- + .../drm/nouveau/core/include/subdev/bios/rammap.h | 5 +- + .../drm/nouveau/core/include/subdev/bios/therm.h | 10 +- + .../gpu/drm/nouveau/core/include/subdev/clock.h | 1 + + drivers/gpu/drm/nouveau/core/include/subdev/fb.h | 7 +- + .../drm/nouveau/core/include/subdev/fb/regsnv04.h | 21 + + drivers/gpu/drm/nouveau/core/include/subdev/fuse.h | 30 + + drivers/gpu/drm/nouveau/core/include/subdev/gpio.h | 2 +- + drivers/gpu/drm/nouveau/core/include/subdev/pwr.h | 3 + + .../gpu/drm/nouveau/core/include/subdev/therm.h | 1 + + drivers/gpu/drm/nouveau/core/subdev/bar/base.c | 38 +- + drivers/gpu/drm/nouveau/core/subdev/bios/M0205.c | 136 ++ + drivers/gpu/drm/nouveau/core/subdev/bios/M0209.c | 137 ++ + drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c | 1 + + drivers/gpu/drm/nouveau/core/subdev/bios/fan.c | 93 ++ + drivers/gpu/drm/nouveau/core/subdev/bios/rammap.c | 74 +- + drivers/gpu/drm/nouveau/core/subdev/bios/timing.c | 8 + + drivers/gpu/drm/nouveau/core/subdev/clock/base.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/clock/nva3.c | 303 +++- + drivers/gpu/drm/nouveau/core/subdev/clock/nva3.h | 10 +- + drivers/gpu/drm/nouveau/core/subdev/clock/nvaa.c | 37 +- + .../gpu/drm/nouveau/core/subdev/devinit/fbmem.h | 18 +- + drivers/gpu/drm/nouveau/core/subdev/fb/gddr5.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/fb/nv20.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/fb/nv25.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/fb/nv30.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/fb/nv35.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/fb/nv36.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/fb/nv40.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/fb/priv.h | 1 + + drivers/gpu/drm/nouveau/core/subdev/fb/ramfuc.h | 82 +- + drivers/gpu/drm/nouveau/core/subdev/fb/ramnv04.c | 17 +- + drivers/gpu/drm/nouveau/core/subdev/fb/ramnv50.c | 24 +- + drivers/gpu/drm/nouveau/core/subdev/fb/ramnva3.c | 96 +- + drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c | 9 +- + drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c | 490 ++++-- + drivers/gpu/drm/nouveau/core/subdev/fb/sddr2.c | 94 ++ + drivers/gpu/drm/nouveau/core/subdev/fb/sddr3.c | 47 +- + drivers/gpu/drm/nouveau/core/subdev/fuse/base.c | 54 + + drivers/gpu/drm/nouveau/core/subdev/fuse/g80.c | 81 + + drivers/gpu/drm/nouveau/core/subdev/fuse/gf100.c | 83 + + drivers/gpu/drm/nouveau/core/subdev/fuse/gm107.c | 66 + + drivers/gpu/drm/nouveau/core/subdev/fuse/priv.h | 9 + + drivers/gpu/drm/nouveau/core/subdev/gpio/base.c | 3 +- + .../nouveau/core/subdev/gpio/{nv92.c => nv94.c} | 12 +- + drivers/gpu/drm/nouveau/core/subdev/gpio/nvd0.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/gpio/priv.h | 4 +- + drivers/gpu/drm/nouveau/core/subdev/i2c/base.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/ltc/base.c | 2 +- + drivers/gpu/drm/nouveau/core/subdev/ltc/gf100.c | 39 +- + drivers/gpu/drm/nouveau/core/subdev/ltc/gm107.c | 5 - + drivers/gpu/drm/nouveau/core/subdev/ltc/priv.h | 2 + + drivers/gpu/drm/nouveau/core/subdev/pwr/base.c | 2 + + .../gpu/drm/nouveau/core/subdev/pwr/fuc/arith.fuc | 94 ++ + .../gpu/drm/nouveau/core/subdev/pwr/fuc/kernel.fuc | 122 +- + .../gpu/drm/nouveau/core/subdev/pwr/fuc/macros.fuc | 20 + + .../gpu/drm/nouveau/core/subdev/pwr/fuc/memx.fuc | 133 +- + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nv108.fuc | 4 + + .../drm/nouveau/core/subdev/pwr/fuc/nv108.fuc.h | 903 ++++++---- + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc | 4 + + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h | 1270 +++++++------- + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc | 4 + + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc.h | 1300 +++++++------- + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc | 4 + + .../gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc.h | 869 ++++++---- + drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/os.h | 11 +- + drivers/gpu/drm/nouveau/core/subdev/pwr/memx.c | 58 +- + drivers/gpu/drm/nouveau/core/subdev/therm/fan.c | 9 +- + drivers/gpu/drm/nouveau/core/subdev/therm/fanpwm.c | 8 +- + drivers/gpu/drm/nouveau/core/subdev/therm/gm107.c | 93 ++ + drivers/gpu/drm/nouveau/core/subdev/therm/nv84.c | 38 +- + drivers/gpu/drm/nouveau/core/subdev/therm/nva3.c | 2 + + drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/therm/priv.h | 3 + + drivers/gpu/drm/nouveau/core/subdev/vm/base.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 15 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 120 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 9 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_chan.h | 2 + + drivers/gpu/drm/nouveau/nouveau_connector.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 4 + + drivers/gpu/drm/nouveau/nouveau_display.c | 29 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 39 +- + drivers/gpu/drm/nouveau/nouveau_drm.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.h | 3 + + drivers/gpu/drm/nouveau/nouveau_fence.c | 551 ++++-- + drivers/gpu/drm/nouveau/nouveau_fence.h | 29 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 180 +- + drivers/gpu/drm/nouveau/nouveau_gem.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_sysfs.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_sysfs.h | 2 + + drivers/gpu/drm/nouveau/nouveau_ttm.c | 11 +- + drivers/gpu/drm/nouveau/nv04_fence.c | 8 +- + drivers/gpu/drm/nouveau/nv10_fence.c | 8 +- + drivers/gpu/drm/nouveau/nv17_fence.c | 6 +- + drivers/gpu/drm/nouveau/nv50_display.c | 46 +- + drivers/gpu/drm/nouveau/nv50_fence.c | 6 +- + drivers/gpu/drm/nouveau/nv84_fence.c | 31 +- + drivers/gpu/drm/nouveau/nvif/class.h | 9 + + drivers/gpu/drm/omapdrm/omap_drv.c | 1 + + drivers/gpu/drm/omapdrm/omap_drv.h | 1 + + drivers/gpu/drm/panel/panel-simple.c | 27 + + drivers/gpu/drm/qxl/Makefile | 2 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 7 - + drivers/gpu/drm/qxl/qxl_debugfs.c | 14 +- + drivers/gpu/drm/qxl/qxl_display.c | 49 + + drivers/gpu/drm/qxl/qxl_drv.c | 33 +- + drivers/gpu/drm/qxl/qxl_drv.h | 36 +- + drivers/gpu/drm/qxl/qxl_fb.c | 3 +- + drivers/gpu/drm/qxl/qxl_fence.c | 91 - + drivers/gpu/drm/qxl/qxl_kms.c | 17 +- + drivers/gpu/drm/qxl/qxl_object.c | 21 +- + drivers/gpu/drm/qxl/qxl_object.h | 6 +- + drivers/gpu/drm/qxl/qxl_prime.c | 72 + + drivers/gpu/drm/qxl/qxl_release.c | 174 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 103 +- + drivers/gpu/drm/r128/r128_cce.c | 24 +- + drivers/gpu/drm/r128/r128_drv.c | 3 +- + drivers/gpu/drm/r128/r128_drv.h | 3 + + drivers/gpu/drm/radeon/Makefile | 6 +- + drivers/gpu/drm/radeon/atombios_dp.c | 4 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 23 - + drivers/gpu/drm/radeon/btc_dpm.c | 51 - + drivers/gpu/drm/radeon/btc_dpm.h | 2 - + drivers/gpu/drm/radeon/ci_dpm.c | 30 +- + drivers/gpu/drm/radeon/cik.c | 52 +- + drivers/gpu/drm/radeon/cik_sdma.c | 25 +- + drivers/gpu/drm/radeon/dce3_1_afmt.c | 4 +- + drivers/gpu/drm/radeon/dce6_afmt.c | 6 +- + drivers/gpu/drm/{ => radeon}/drm_buffer.c | 6 +- + .../drm => drivers/gpu/drm/radeon}/drm_buffer.h | 0 + drivers/gpu/drm/radeon/evergreen.c | 7 +- + drivers/gpu/drm/radeon/evergreen_dma.c | 24 +- + drivers/gpu/drm/radeon/evergreen_hdmi.c | 49 +- + drivers/gpu/drm/radeon/kv_dpm.c | 2 + + drivers/gpu/drm/radeon/ni_dpm.c | 24 - + drivers/gpu/drm/radeon/r100.c | 21 +- + drivers/gpu/drm/radeon/r200.c | 21 +- + drivers/gpu/drm/radeon/r300_cmdbuf.c | 2 +- + drivers/gpu/drm/radeon/r600.c | 159 +- + drivers/gpu/drm/radeon/r600_audio.c | 207 --- + drivers/gpu/drm/radeon/r600_cp.c | 26 +- + drivers/gpu/drm/radeon/r600_dma.c | 25 +- + drivers/gpu/drm/radeon/r600_hdmi.c | 172 +- + drivers/gpu/drm/radeon/r600d.h | 58 +- + drivers/gpu/drm/radeon/radeon.h | 125 +- + drivers/gpu/drm/radeon/radeon_asic.c | 25 +- + drivers/gpu/drm/radeon/radeon_asic.h | 78 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 6 +- + drivers/gpu/drm/radeon/radeon_benchmark.c | 34 +- + drivers/gpu/drm/radeon/radeon_combios.c | 2 +- + drivers/gpu/drm/radeon/radeon_cp.c | 46 +- + drivers/gpu/drm/radeon/radeon_cs.c | 77 +- + drivers/gpu/drm/radeon/radeon_device.c | 63 +- + drivers/gpu/drm/radeon/radeon_display.c | 35 +- + drivers/gpu/drm/radeon/radeon_drv.c | 13 +- + drivers/gpu/drm/radeon/radeon_drv.h | 2 + + drivers/gpu/drm/radeon/radeon_encoders.c | 21 + + drivers/gpu/drm/radeon/radeon_fb.c | 3 +- + drivers/gpu/drm/radeon/radeon_fence.c | 479 ++++-- + drivers/gpu/drm/radeon/radeon_gart.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 121 +- + drivers/gpu/drm/radeon/radeon_ib.c | 3 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 33 +- + drivers/gpu/drm/radeon/radeon_kms.c | 1 + + drivers/gpu/drm/radeon/radeon_mn.c | 274 +++ + drivers/gpu/drm/radeon/radeon_mode.h | 1 + + drivers/gpu/drm/radeon/radeon_object.c | 104 +- + drivers/gpu/drm/radeon/radeon_object.h | 1 + + drivers/gpu/drm/radeon/radeon_pm.c | 2 +- + drivers/gpu/drm/radeon/radeon_prime.c | 20 +- + drivers/gpu/drm/radeon/radeon_ring.c | 23 +- + drivers/gpu/drm/radeon/radeon_sa.c | 2 +- + drivers/gpu/drm/radeon/radeon_semaphore.c | 53 +- + drivers/gpu/drm/radeon/radeon_state.c | 2 +- + drivers/gpu/drm/radeon/radeon_test.c | 29 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 237 ++- + drivers/gpu/drm/radeon/radeon_uvd.c | 159 +- + drivers/gpu/drm/radeon/radeon_vce.c | 3 +- + drivers/gpu/drm/radeon/radeon_vm.c | 24 +- + drivers/gpu/drm/radeon/rv770.c | 1 - + drivers/gpu/drm/radeon/rv770_dma.c | 25 +- + drivers/gpu/drm/radeon/si.c | 8 +- + drivers/gpu/drm/radeon/si_dma.c | 25 +- + drivers/gpu/drm/radeon/si_dpm.c | 24 - + drivers/gpu/drm/radeon/sid.h | 2 +- + drivers/gpu/drm/radeon/uvd_v1_0.c | 107 +- + drivers/gpu/drm/radeon/uvd_v2_2.c | 4 + + drivers/gpu/drm/rcar-du/Kconfig | 1 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 173 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 13 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 5 +- + drivers/gpu/drm/rcar-du/rcar_du_group.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_group.h | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 233 ++- + drivers/gpu/drm/rcar-du/rcar_du_kms.h | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 45 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h | 5 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_vgacon.h | 2 +- + drivers/gpu/drm/savage/savage_bci.c | 39 +- + drivers/gpu/drm/savage/savage_drv.c | 3 +- + drivers/gpu/drm/savage/savage_drv.h | 2 + + drivers/gpu/drm/shmobile/shmob_drm_backlight.c | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_backlight.h | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 3 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.h | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.h | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.h | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_regs.h | 2 +- + drivers/gpu/drm/sis/sis_drv.c | 3 +- + drivers/gpu/drm/sis/sis_drv.h | 2 + + drivers/gpu/drm/sis/sis_mm.c | 6 +- + drivers/gpu/drm/sti/sti_vtac.c | 12 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 4 +- + drivers/gpu/drm/tegra/dpaux.c | 4 +- + drivers/gpu/drm/tegra/gem.h | 1 + + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 61 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 74 +- + drivers/gpu/drm/ttm/ttm_bo.c | 304 ++-- + drivers/gpu/drm/ttm/ttm_bo_manager.c | 9 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 48 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 8 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 160 +- + drivers/gpu/drm/ttm/ttm_memory.c | 3 +- + drivers/gpu/drm/udl/Kconfig | 3 +- + drivers/gpu/drm/udl/udl_connector.c | 4 +- + drivers/gpu/drm/udl/udl_drv.c | 102 +- + drivers/gpu/drm/udl/udl_drv.h | 2 + + drivers/gpu/drm/udl/udl_fb.c | 3 +- + drivers/gpu/drm/udl/udl_main.c | 8 +- + drivers/gpu/drm/via/via_dma.c | 4 +- + drivers/gpu/drm/via/via_drv.c | 3 +- + drivers/gpu/drm/via/via_drv.h | 2 + + drivers/gpu/drm/via/via_map.c | 6 +- + drivers/gpu/drm/via/via_mm.c | 6 +- + drivers/gpu/drm/via/via_verifier.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 183 +- + drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 22 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 27 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 346 ++-- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 35 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 11 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 50 +- + drivers/gpu/ipu-v3/Kconfig | 3 +- + drivers/gpu/ipu-v3/Makefile | 4 +- + drivers/gpu/ipu-v3/ipu-common.c | 479 +++++- + drivers/gpu/ipu-v3/ipu-cpmem.c | 217 ++- + drivers/gpu/ipu-v3/ipu-csi.c | 741 ++++++++ + drivers/gpu/ipu-v3/ipu-ic.c | 778 +++++++++ + drivers/gpu/ipu-v3/ipu-prv.h | 30 +- + drivers/gpu/ipu-v3/ipu-smfc.c | 157 +- + drivers/staging/imx-drm/imx-drm-core.c | 1 + + drivers/video/fbdev/Kconfig | 4 + + drivers/video/fbdev/core/Makefile | 1 + + drivers/video/fbdev/core/fb_cmdline.c | 110 ++ + drivers/video/fbdev/core/fbmem.c | 92 - + drivers/video/fbdev/core/modedb.c | 3 - + include/drm/ati_pcigart.h | 30 + + include/drm/drmP.h | 721 +------- + include/drm/drm_agpsupport.h | 26 +- + include/drm/drm_crtc.h | 30 +- + include/drm/drm_dp_helper.h | 16 +- + include/drm/drm_fb_helper.h | 1 - + include/drm/drm_gem.h | 183 ++ + include/drm/drm_gem_cma_helper.h | 4 +- + include/drm/drm_legacy.h | 203 +++ + include/drm/drm_memory.h | 59 - + include/drm/drm_mipi_dsi.h | 2 + + include/drm/drm_modeset_lock.h | 20 +- + include/drm/drm_usb.h | 15 - + include/drm/ttm/ttm_bo_api.h | 49 +- + include/drm/ttm/ttm_bo_driver.h | 32 +- + include/drm/ttm/ttm_execbuf_util.h | 24 +- + include/linux/platform_data/rcar-du.h | 4 +- + include/uapi/drm/exynos_drm.h | 40 - + include/uapi/drm/radeon_drm.h | 23 + + include/uapi/drm/vmwgfx_drm.h | 2 +- + include/video/imx-ipu-v3.h | 144 +- + 523 files changed, 24525 insertions(+), 11085 deletions(-) + create mode 100644 Documentation/devicetree/bindings/panel/auo,b101xtn01.txt + create mode 100644 Documentation/devicetree/bindings/video/adi,adv7123.txt + create mode 100644 Documentation/devicetree/bindings/video/renesas,du.txt + create mode 100644 Documentation/devicetree/bindings/video/thine,thc63lvdm83d + create mode 100644 Documentation/devicetree/bindings/video/vga-connector.txt + create mode 100644 drivers/gpu/drm/drm_internal.h + delete mode 100644 drivers/gpu/drm/drm_usb.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_render_state.h + create mode 100644 drivers/gpu/drm/i915/intel_lrc.c + create mode 100644 drivers/gpu/drm/i915/intel_lrc.h + create mode 100644 drivers/gpu/drm/msm/adreno/adreno_device.c + create mode 100644 drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c + create mode 100644 drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c + create mode 100644 drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_pll.c + create mode 100644 drivers/gpu/drm/nouveau/core/engine/disp/hdminve0.c + create mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/M0205.h + create mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/M0209.h + create mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/bios/fan.h + create mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/fb/regsnv04.h + create mode 100644 drivers/gpu/drm/nouveau/core/include/subdev/fuse.h + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/bios/M0205.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/bios/M0209.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/bios/fan.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/sddr2.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fuse/base.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fuse/g80.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fuse/gf100.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fuse/gm107.c + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fuse/priv.h + rename drivers/gpu/drm/nouveau/core/subdev/gpio/{nv92.c => nv94.c} (88%) + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/arith.fuc + create mode 100644 drivers/gpu/drm/nouveau/core/subdev/therm/gm107.c + delete mode 100644 drivers/gpu/drm/qxl/qxl_fence.c + create mode 100644 drivers/gpu/drm/qxl/qxl_prime.c + rename drivers/gpu/drm/{ => radeon}/drm_buffer.c (96%) + rename {include/drm => drivers/gpu/drm/radeon}/drm_buffer.h (100%) + delete mode 100644 drivers/gpu/drm/radeon/r600_audio.c + create mode 100644 drivers/gpu/drm/radeon/radeon_mn.c + create mode 100644 drivers/gpu/ipu-v3/ipu-csi.c + create mode 100644 drivers/gpu/ipu-v3/ipu-ic.c + create mode 100644 drivers/video/fbdev/core/fb_cmdline.c + create mode 100644 include/drm/ati_pcigart.h + create mode 100644 include/drm/drm_gem.h + create mode 100644 include/drm/drm_legacy.h + delete mode 100644 include/drm/drm_memory.h + delete mode 100644 include/drm/drm_usb.h +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 (1180e20606fd drm/i915: properly reenable gen8 pipe IRQs) +$ git merge drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_irq.c | 5 +++-- + drivers/gpu/drm/i915/intel_display.c | 3 --- + drivers/gpu/drm/i915/intel_drv.h | 3 +++ + drivers/gpu/drm/i915/intel_panel.c | 5 ++--- + 4 files changed, 8 insertions(+), 8 deletions(-) +Merging drm-tegra/drm/tegra/for-next (7d1311b93e58 Linux 3.17-rc1) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging sound/for-next (fd1a2a90d08b Merge tag 'asoc-v3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (6f39b0dbe646 Merge remote-tracking branches 'asoc/fix/88pm860x', 'asoc/fix/fsl', 'asoc/fix/imx', 'asoc/fix/mc13783', 'asoc/fix/rockchip' and 'asoc/fix/simple' into asoc-linus) +$ git merge sound-asoc/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging modules/modules-next (184c3fc3f52f moduleparam: Resolve missing-field-initializer warning) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (7ec62d421bdf Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (2c9a9cfec04f Input: automatically set EV_ABS bit in input_set_abs_params) +$ git merge input/next +Auto-merging drivers/input/keyboard/adp5588-keys.c +Merge made by the 'recursive' strategy. + drivers/input/evdev.c | 13 +++--- + drivers/input/input.c | 3 +- + drivers/input/keyboard/adp5588-keys.c | 1 + + drivers/input/keyboard/opencores-kbd.c | 72 ++++++++-------------------------- + 4 files changed, 28 insertions(+), 61 deletions(-) +Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) +$ git merge input-mt/for-next +Already up-to-date. +Merging block/for-next (2d5d786aa560 Merge branch 'for-3.18/core' into for-next) +$ git merge block/for-next +Resolved 'block/blk-core.c' using previous resolution. +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging drivers/scsi/st.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/Kconfig +Auto-merging drivers/block/rsxx/core.c +Auto-merging block/blk-mq.c +Auto-merging block/blk-core.c +CONFLICT (content): Merge conflict in block/blk-core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a740283934fc] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-block | 8 + + Documentation/block/data-integrity.txt | 54 +---- + block/Kconfig | 1 + + block/Makefile | 4 +- + block/bio-integrity.c | 269 ++++++--------------- + block/bio.c | 61 +++-- + block/blk-cgroup.c | 2 - + block/blk-cgroup.h | 3 - + block/blk-core.c | 59 +++-- + block/blk-flush.c | 147 +++++++---- + block/blk-integrity.c | 103 +++++--- + block/blk-merge.c | 14 +- + block/blk-mq-tag.c | 55 ++--- + block/blk-mq.c | 361 ++++++++++++++-------------- + block/blk-mq.h | 3 +- + block/blk-settings.c | 4 +- + block/blk-sysfs.c | 4 +- + block/blk-timeout.c | 15 +- + block/blk.h | 37 ++- + block/bsg.c | 9 +- + block/cfq-iosched.c | 10 +- + block/compat_ioctl.c | 4 - + block/ioctl.c | 4 - + block/partitions/mac.c | 8 +- + block/scsi_ioctl.c | 11 +- + block/t10-pi.c | 197 +++++++++++++++ + drivers/block/drbd/drbd_actlog.c | 4 +- + drivers/block/drbd/drbd_bitmap.c | 6 +- + drivers/block/drbd/drbd_debugfs.c | 2 +- + drivers/block/drbd/drbd_int.h | 19 +- + drivers/block/drbd/drbd_interval.c | 40 +-- + drivers/block/drbd/drbd_main.c | 28 +-- + drivers/block/drbd/drbd_proc.c | 4 +- + drivers/block/drbd/drbd_receiver.c | 52 ++-- + drivers/block/drbd/drbd_req.c | 2 +- + drivers/block/drbd/drbd_state.c | 18 +- + drivers/block/drbd/drbd_worker.c | 51 ++-- + drivers/block/hd.c | 12 +- + drivers/block/mtip32xx/mtip32xx.c | 10 +- + drivers/block/nbd.c | 1 + + drivers/block/null_blk.c | 8 +- + drivers/block/nvme-core.c | 1 + + drivers/block/paride/pd.c | 2 + + drivers/block/pktcdvd.c | 2 + + drivers/block/rsxx/core.c | 2 +- + drivers/block/rsxx/dev.c | 1 + + drivers/block/skd_main.c | 1 + + drivers/block/sx8.c | 2 +- + drivers/block/virtio_blk.c | 8 +- + drivers/block/xen-blkback/blkback.c | 1 + + drivers/block/xen-blkback/xenbus.c | 6 +- + drivers/block/xen-blkfront.c | 12 +- + drivers/block/zram/zram_drv.c | 1 + + drivers/cdrom/cdrom.c | 4 +- + drivers/ide/ide-disk.c | 4 +- + drivers/ide/ide-park.c | 2 +- + drivers/md/bcache/super.c | 1 + + drivers/mmc/card/queue.c | 1 + + drivers/mtd/mtd_blkdevs.c | 1 + + drivers/s390/block/scm_blk.c | 1 + + drivers/s390/block/xpram.c | 1 + + drivers/scsi/Kconfig | 1 - + drivers/scsi/device_handler/scsi_dh_alua.c | 2 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 2 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 4 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 2 +- + drivers/scsi/osd/osd_initiator.c | 4 +- + drivers/scsi/osst.c | 2 +- + drivers/scsi/scsi_error.c | 2 + + drivers/scsi/scsi_lib.c | 25 +- + drivers/scsi/sd.c | 77 +++--- + drivers/scsi/sd.h | 66 ++++- + drivers/scsi/sd_dif.c | 353 ++++----------------------- + drivers/scsi/sg.c | 4 +- + drivers/scsi/st.c | 2 +- + drivers/target/target_core_pscsi.c | 2 +- + fs/block_dev.c | 34 +-- + fs/btrfs/disk-io.c | 2 +- + fs/xfs/xfs_buf.c | 2 - + include/linux/backing-dev.h | 4 - + include/linux/bio.h | 65 +++-- + include/linux/blk-mq.h | 22 +- + include/linux/blk_types.h | 16 +- + include/linux/blkdev.h | 71 +++--- + include/linux/crc-t10dif.h | 5 +- + include/linux/t10-pi.h | 22 ++ + include/scsi/scsi_cmnd.h | 36 ++- + mm/backing-dev.c | 40 ++- + 88 files changed, 1328 insertions(+), 1297 deletions(-) + create mode 100644 block/t10-pi.c + create mode 100644 include/linux/t10-pi.h +Merging device-mapper/for-next (010b788c73c9 dm crypt: sort writes) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-bufio.c | 5 +- + drivers/md/dm-crypt.c | 368 +++++++++++++++++---------------- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-log-userspace-transfer.c | 2 +- + drivers/md/dm-mpath.c | 4 +- + drivers/md/dm-raid.c | 60 +++++- + drivers/md/dm-table.c | 102 +++------ + drivers/md/dm.c | 143 ++++++++++++- + drivers/md/dm.h | 5 +- + include/uapi/linux/dm-ioctl.h | 4 +- + 10 files changed, 424 insertions(+), 271 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 (583f958b8a23 ARM: dts: fix MMC2 regulators for Exynos5420 Arndale Octa board) +$ git merge mmc-uh/next +Recorded preimage for 'arch/arm/boot/dts/exynos5420-arndale-octa.dts' +Auto-merging drivers/mmc/core/sdio_bus.c +Auto-merging drivers/mmc/card/queue.c +Auto-merging arch/arm/mach-shmobile/board-lager.c +Auto-merging arch/arm/mach-shmobile/board-koelsch.c +Auto-merging arch/arm/boot/dts/exynos5420-arndale-octa.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420-arndale-octa.dts +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/boot/dts/exynos5420-arndale-octa.dts'. +[master b8ded233422f] Merge remote-tracking branch 'mmc-uh/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/mmc/mmc.txt | 2 + + .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 6 +- + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 3 + + MAINTAINERS | 3 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 3 +- + arch/arm/mach-shmobile/board-koelsch.c | 3 - + arch/arm/mach-shmobile/board-lager.c | 2 - + drivers/mmc/card/block.c | 21 +- + drivers/mmc/card/queue.c | 6 +- + drivers/mmc/card/sdio_uart.c | 9 +- + drivers/mmc/core/core.c | 48 ++-- + drivers/mmc/core/host.c | 96 ++++--- + drivers/mmc/core/mmc.c | 263 +++++++++++------- + drivers/mmc/core/mmc_ops.c | 24 +- + drivers/mmc/core/mmc_ops.h | 1 + + drivers/mmc/core/sd.c | 41 +-- + drivers/mmc/core/sdio.c | 19 +- + drivers/mmc/core/sdio_bus.c | 4 +- + drivers/mmc/core/sdio_irq.c | 11 +- + drivers/mmc/core/slot-gpio.c | 70 ++++- + drivers/mmc/host/Kconfig | 23 +- + drivers/mmc/host/Makefile | 2 + + drivers/mmc/host/atmel-mci.c | 55 ++-- + drivers/mmc/host/au1xmmc.c | 5 +- + drivers/mmc/host/dw_mmc-pci.c | 3 - + drivers/mmc/host/dw_mmc-pltfm.c | 10 +- + drivers/mmc/host/dw_mmc-rockchip.c | 136 ++++++++++ + drivers/mmc/host/dw_mmc.c | 297 +++++++++++++++------ + drivers/mmc/host/dw_mmc.h | 5 +- + drivers/mmc/host/jz4740_mmc.c | 269 ++++++++++++++++++- + drivers/mmc/host/mmc_spi.c | 1 + + drivers/mmc/host/mmci.c | 115 +++++--- + drivers/mmc/host/mmci_qcom_dml.c | 177 ++++++++++++ + drivers/mmc/host/mmci_qcom_dml.h | 31 +++ + drivers/mmc/host/moxart-mmc.c | 1 - + drivers/mmc/host/mxcmmc.c | 1 - + drivers/mmc/host/mxs-mmc.c | 1 - + drivers/mmc/host/omap.c | 1 - + drivers/mmc/host/omap_hsmmc.c | 15 +- + drivers/mmc/host/pxamci.c | 5 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 9 +- + drivers/mmc/host/rtsx_usb_sdmmc.c | 9 +- + drivers/mmc/host/s3cmci.c | 4 +- + drivers/mmc/host/sdhci-acpi.c | 111 +++++--- + drivers/mmc/host/sdhci-bcm-kona.c | 3 +- + drivers/mmc/host/sdhci-bcm2835.c | 1 - + drivers/mmc/host/sdhci-cns3xxx.c | 1 - + drivers/mmc/host/sdhci-dove.c | 1 - + drivers/mmc/host/sdhci-esdhc-imx.c | 21 +- + drivers/mmc/host/sdhci-msm.c | 27 +- + drivers/mmc/host/sdhci-of-arasan.c | 1 - + drivers/mmc/host/sdhci-of-esdhc.c | 1 - + drivers/mmc/host/sdhci-of-hlwd.c | 1 - + drivers/mmc/host/sdhci-pci.c | 70 ++++- + drivers/mmc/host/sdhci-pci.h | 7 + + drivers/mmc/host/sdhci-pltfm.c | 10 +- + drivers/mmc/host/sdhci-pxav2.c | 1 - + drivers/mmc/host/sdhci-pxav3.c | 8 +- + drivers/mmc/host/sdhci-s3c.c | 5 +- + drivers/mmc/host/sdhci-sirf.c | 26 +- + drivers/mmc/host/sdhci-spear.c | 1 - + drivers/mmc/host/sdhci-tegra.c | 1 - + drivers/mmc/host/sdhci.c | 155 +++++++---- + drivers/mmc/host/sdhci.h | 4 + + drivers/mmc/host/sh_mmcif.c | 1 - + drivers/mmc/host/sh_mobile_sdhi.c | 53 +++- + drivers/mmc/host/sunxi-mmc.c | 4 +- + drivers/mmc/host/tifm_sd.c | 4 +- + drivers/mmc/host/tmio_mmc.c | 7 +- + drivers/mmc/host/tmio_mmc.h | 31 +-- + drivers/mmc/host/tmio_mmc_dma.c | 8 +- + drivers/mmc/host/tmio_mmc_pio.c | 294 ++++++++++++-------- + drivers/mmc/host/wbsd.c | 21 +- + include/linux/atmel-mci.h | 2 + + include/linux/mfd/tmio.h | 25 ++ + include/linux/mmc/card.h | 10 +- + include/linux/mmc/dw_mmc.h | 4 +- + include/linux/mmc/host.h | 12 +- + include/linux/mmc/mmc.h | 7 + + include/linux/mmc/sdhci.h | 3 + + include/linux/mmc/slot-gpio.h | 5 +- + 81 files changed, 2007 insertions(+), 750 deletions(-) + create mode 100644 drivers/mmc/host/dw_mmc-rockchip.c + create mode 100644 drivers/mmc/host/mmci_qcom_dml.c + create mode 100644 drivers/mmc/host/mmci_qcom_dml.h +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 (86143256d202 md/bitmap: remove bev_logical_block_size rounding where not needed.) +$ git merge md/for-next +Auto-merging drivers/md/raid5.c +Merge made by the 'recursive' strategy. + drivers/md/bitmap.c | 19 +++++++------------ + drivers/md/md.c | 15 ++++----------- + drivers/md/raid1.c | 23 +++++++++++------------ + drivers/md/raid10.c | 10 ++++++---- + drivers/md/raid5.c | 6 ++---- + 5 files changed, 30 insertions(+), 43 deletions(-) +Merging mfd/for-mfd-next (d86c21fd3111 mfd: cros_ec: wait for completion of commands that return IN_PROGRESS) +$ git merge mfd/for-mfd-next +Auto-merging include/linux/pci_ids.h +Removing include/linux/mfd/ti_ssp.h +Auto-merging include/linux/mfd/max77693-private.h +Auto-merging drivers/mfd/twl4030-power.c +Auto-merging drivers/mfd/sm501.c +Auto-merging drivers/mfd/htc-i2cpld.c +Auto-merging drivers/input/keyboard/cros_ec_keyb.c +Auto-merging drivers/i2c/busses/i2c-cros-ec-tunnel.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/mfd/qcom-pm8xxx.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-power | 14 + + Documentation/acpi/enumeration.txt | 27 ++ + Documentation/devicetree/bindings/mfd/arizona.txt | 7 + + .../devicetree/bindings/mfd/atmel-gpbr.txt | 15 + + Documentation/devicetree/bindings/mfd/hi6421.txt | 38 +++ + Documentation/devicetree/bindings/mfd/max14577.txt | 146 ++++++++ + .../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 64 ++++ + .../mfd/{qcom,pm8xxx.txt => qcom-pm8xxx.txt} | 1 + + Documentation/devicetree/bindings/mfd/rk808.txt | 177 ++++++++++ + Documentation/devicetree/bindings/mfd/rn5t618.txt | 36 ++ + Documentation/devicetree/bindings/mfd/stmpe.txt | 1 + + .../devicetree/bindings/mfd/twl4030-power.txt | 9 +- + MAINTAINERS | 9 + + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 5 +- + drivers/input/keyboard/cros_ec_keyb.c | 2 +- + drivers/mfd/88pm860x-i2c.c | 66 +--- + drivers/mfd/Kconfig | 56 +++- + drivers/mfd/Makefile | 4 + + drivers/mfd/arizona-core.c | 29 +- + drivers/mfd/arizona-irq.c | 14 +- + drivers/mfd/axp20x.c | 11 - + drivers/mfd/cros_ec.c | 48 +++ + drivers/mfd/cros_ec_spi.c | 20 +- + drivers/mfd/da9052-core.c | 2 +- + drivers/mfd/da9052-i2c.c | 7 - + drivers/mfd/da9052-spi.c | 7 +- + drivers/mfd/hi6421-pmic-core.c | 113 +++++++ + drivers/mfd/htc-i2cpld.c | 44 +-- + drivers/mfd/intel_soc_pmic_core.c | 2 + + drivers/mfd/lpc_ich.c | 17 + + drivers/mfd/lpc_sch.c | 211 +++++++----- + drivers/mfd/max14577.c | 103 +++++- + drivers/mfd/max77686.c | 2 +- + drivers/mfd/max77693.c | 5 +- + drivers/mfd/max8925-i2c.c | 2 +- + drivers/mfd/mc13xxx-core.c | 8 + + drivers/mfd/menelaus.c | 11 +- + drivers/mfd/mfd-core.c | 41 +++ + drivers/mfd/pcf50633-core.c | 35 +- + drivers/mfd/qcom-spmi-pmic.c | 67 ++++ + drivers/mfd/rk808.c | 275 +++++++++++++++ + drivers/mfd/rn5t618.c | 134 ++++++++ + drivers/mfd/rtsx_pcr.c | 2 +- + drivers/mfd/rtsx_usb.c | 2 +- + drivers/mfd/sm501.c | 2 +- + drivers/mfd/stmpe.c | 11 +- + drivers/mfd/ti_am335x_tscadc.c | 35 +- + drivers/mfd/tps65217.c | 2 + + drivers/mfd/tps65910.c | 5 + + drivers/mfd/twl4030-irq.c | 8 +- + drivers/mfd/twl4030-power.c | 3 + + drivers/mfd/twl6040.c | 1 + + drivers/mfd/wm5102-tables.c | 16 +- + drivers/mfd/wm5110-tables.c | 10 +- + drivers/mfd/wm8994-irq.c | 2 + + drivers/mfd/wm8994-regmap.c | 4 + + drivers/power/Kconfig | 5 +- + drivers/power/max14577_charger.c | 370 +++++++++++++++++++-- + drivers/power/max17040_battery.c | 3 +- + drivers/regulator/max14577.c | 80 +---- + include/dt-bindings/clock/rockchip,rk808.h | 11 + + include/linux/mfd/arizona/registers.h | 29 +- + include/linux/mfd/core.h | 3 + + include/linux/mfd/cros_ec.h | 24 +- + include/linux/mfd/da9052/da9052.h | 2 +- + include/linux/mfd/davinci_voicecodec.h | 2 +- + include/linux/mfd/hi6421-pmic.h | 41 +++ + include/linux/mfd/max14577-private.h | 95 ++++-- + include/linux/mfd/max14577.h | 30 ++ + include/linux/mfd/max77693-private.h | 61 +++- + include/linux/mfd/max77693.h | 40 +++ + include/linux/mfd/rk808.h | 196 +++++++++++ + include/linux/mfd/rn5t618.h | 228 +++++++++++++ + include/linux/mfd/ti_am335x_tscadc.h | 1 + + include/linux/mfd/ti_ssp.h | 93 ------ + include/linux/mfd/tps65217.h | 2 + + include/linux/pci_ids.h | 1 + + sound/soc/codecs/arizona.c | 2 +- + 78 files changed, 2765 insertions(+), 542 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/atmel-gpbr.txt + create mode 100644 Documentation/devicetree/bindings/mfd/hi6421.txt + create mode 100644 Documentation/devicetree/bindings/mfd/max14577.txt + create mode 100644 Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt + rename Documentation/devicetree/bindings/mfd/{qcom,pm8xxx.txt => qcom-pm8xxx.txt} (98%) + create mode 100644 Documentation/devicetree/bindings/mfd/rk808.txt + create mode 100644 Documentation/devicetree/bindings/mfd/rn5t618.txt + create mode 100644 drivers/mfd/hi6421-pmic-core.c + create mode 100644 drivers/mfd/qcom-spmi-pmic.c + create mode 100644 drivers/mfd/rk808.c + create mode 100644 drivers/mfd/rn5t618.c + create mode 100644 include/dt-bindings/clock/rockchip,rk808.h + create mode 100644 include/linux/mfd/hi6421-pmic.h + create mode 100644 include/linux/mfd/rk808.h + create mode 100644 include/linux/mfd/rn5t618.h + delete mode 100644 include/linux/mfd/ti_ssp.h +Merging backlight/for-backlight-next (b6af73b42219 backlight: omap1: add blank line after declarations) +$ git merge backlight/for-backlight-next +Auto-merging drivers/video/backlight/pwm_bl.c +Auto-merging drivers/video/backlight/88pm860x_bl.c +Merge made by the 'recursive' strategy. + drivers/video/backlight/88pm860x_bl.c | 1 - + drivers/video/backlight/aat2870_bl.c | 1 - + drivers/video/backlight/adp5520_bl.c | 2 +- + drivers/video/backlight/adp8860_bl.c | 3 +++ + drivers/video/backlight/adp8870_bl.c | 4 ++++ + drivers/video/backlight/ams369fg06.c | 6 +++--- + drivers/video/backlight/as3711_bl.c | 1 - + drivers/video/backlight/corgi_lcd.c | 1 + + drivers/video/backlight/cr_bllcd.c | 1 + + drivers/video/backlight/da903x_bl.c | 1 - + drivers/video/backlight/da9052_bl.c | 1 - + drivers/video/backlight/ep93xx_bl.c | 1 - + drivers/video/backlight/generic_bl.c | 18 ------------------ + drivers/video/backlight/gpio_backlight.c | 1 - + drivers/video/backlight/ili922x.c | 11 ++++++----- + drivers/video/backlight/jornada720_bl.c | 6 +++--- + drivers/video/backlight/jornada720_lcd.c | 6 +----- + drivers/video/backlight/ld9040.c | 6 +++--- + drivers/video/backlight/lm3533_bl.c | 1 - + drivers/video/backlight/lm3639_bl.c | 2 -- + drivers/video/backlight/lms501kf03.c | 12 ++++++------ + drivers/video/backlight/lp855x_bl.c | 2 ++ + drivers/video/backlight/lp8788_bl.c | 1 - + drivers/video/backlight/max8925_bl.c | 1 - + drivers/video/backlight/omap1_bl.c | 1 + + drivers/video/backlight/ot200_bl.c | 1 - + drivers/video/backlight/pandora_bl.c | 1 - + drivers/video/backlight/pcf50633-backlight.c | 1 + + drivers/video/backlight/platform_lcd.c | 1 - + drivers/video/backlight/pwm_bl.c | 1 - + drivers/video/backlight/s6e63m0.c | 12 ++++++------ + drivers/video/backlight/tdo24m.c | 2 ++ + drivers/video/backlight/tps65217_bl.c | 1 - + drivers/video/backlight/wm831x_bl.c | 2 +- + 34 files changed, 45 insertions(+), 68 deletions(-) +Merging battery/master (7881c64716f3 power: ab8500_fg: Fix build warning) +$ git merge battery/master +Resolved 'drivers/power/reset/Kconfig' using previous resolution. +Resolved 'drivers/power/reset/Makefile' using previous resolution. +Auto-merging drivers/power/reset/Makefile +CONFLICT (content): Merge conflict in drivers/power/reset/Makefile +Auto-merging drivers/power/reset/Kconfig +CONFLICT (content): Merge conflict in drivers/power/reset/Kconfig +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm/kernel/process.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a73e6107775f] Merge remote-tracking branch 'battery/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-power | 2 +- + .../devicetree/bindings/gpio/gpio-restart.txt | 54 +++ + .../bindings/power/reset/ltc2952-poweroff.txt | 26 ++ + .../devicetree/bindings/power/reset/st-reset.txt | 11 + + .../bindings/power/reset/syscon-reboot.txt | 23 ++ + Documentation/power/charger-manager.txt | 2 +- + Documentation/power/power_supply_class.txt | 6 + + arch/arm/kernel/process.c | 12 +- + arch/arm64/kernel/process.c | 3 +- + drivers/power/Kconfig | 2 +- + drivers/power/ab8500_fg.c | 9 +- + drivers/power/bq27x00_battery.c | 57 ++- + drivers/power/charger-manager.c | 16 +- + drivers/power/gpio-charger.c | 2 +- + drivers/power/max8925_power.c | 7 +- + drivers/power/power_supply_core.c | 100 +++--- + drivers/power/power_supply_leds.c | 19 +- + drivers/power/power_supply_sysfs.c | 24 +- + drivers/power/reset/Kconfig | 28 ++ + drivers/power/reset/Makefile | 4 + + drivers/power/reset/gpio-restart.c | 149 ++++++++ + drivers/power/reset/ltc2952-poweroff.c | 386 +++++++++++++++++++++ + drivers/power/reset/msm-poweroff.c | 20 +- + drivers/power/reset/restart-poweroff.c | 3 +- + drivers/power/reset/st-poweroff.c | 151 ++++++++ + drivers/power/reset/syscon-reboot.c | 91 +++++ + drivers/power/reset/xgene-reboot.c | 2 +- + drivers/power/sbs-battery.c | 125 ++++++- + drivers/watchdog/alim7101_wdt.c | 42 ++- + drivers/watchdog/moxart_wdt.c | 32 +- + drivers/watchdog/sunxi_wdt.c | 31 +- + include/linux/power_supply.h | 8 +- + include/linux/reboot.h | 3 + + kernel/reboot.c | 81 +++++ + 34 files changed, 1379 insertions(+), 152 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-restart.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/ltc2952-poweroff.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/st-reset.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/syscon-reboot.txt + create mode 100644 drivers/power/reset/gpio-restart.c + create mode 100644 drivers/power/reset/ltc2952-poweroff.c + create mode 100644 drivers/power/reset/st-poweroff.c + create mode 100644 drivers/power/reset/syscon-reboot.c +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 (33ac9dba859b fonts: Add 6x10 font) +$ git merge omap_dss2/for-next +Auto-merging drivers/video/of_display_timing.c +Auto-merging drivers/video/fbdev/atmel_lcdfb.c +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging Documentation/devicetree/bindings/video/atmel,lcdc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/video/atmel,lcdc.txt | 3 + + drivers/video/console/bitblit.c | 3 +- + drivers/video/console/fbcon_ccw.c | 3 +- + drivers/video/console/fbcon_cw.c | 3 +- + drivers/video/console/fbcon_ud.c | 3 +- + drivers/video/fbdev/Kconfig | 3 +- + drivers/video/fbdev/atmel_lcdfb.c | 20 + + drivers/video/fbdev/aty/aty128fb.c | 63 +- + drivers/video/fbdev/au1200fb.c | 1 - + drivers/video/fbdev/controlfb.c | 15 +- + drivers/video/fbdev/core/cfbcopyarea.c | 13 +- + drivers/video/fbdev/core/fbsysfs.c | 12 +- + drivers/video/fbdev/cyber2000fb.c | 16 +- + drivers/video/fbdev/intelfb/intelfbhw.c | 3 +- + drivers/video/fbdev/matrox/matroxfb_base.c | 52 +- + drivers/video/fbdev/matrox/matroxfb_maven.c | 20 +- + drivers/video/fbdev/msm/msm_fb.c | 25 +- + drivers/video/fbdev/mx3fb.c | 2 +- + drivers/video/fbdev/omap2/dss/dispc-compat.c | 9 +- + drivers/video/fbdev/omap2/dss/dsi.c | 10 +- + drivers/video/fbdev/omap2/dss/manager-sysfs.c | 16 +- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 14 +- + drivers/video/fbdev/pxafb.c | 20 +- + drivers/video/fbdev/riva/riva_hw.c | 1 - + drivers/video/fbdev/sa1100fb.c | 18 +- + drivers/video/fbdev/sh_mobile_hdmi.c | 44 +- + drivers/video/fbdev/sis/init301.c | 2 +- + drivers/video/fbdev/sis/sis_main.c | 2 +- + drivers/video/fbdev/stifb.c | 4 +- + drivers/video/fbdev/udlfb.c | 7 +- + drivers/video/fbdev/valkyriefb.c | 14 +- + drivers/video/fbdev/vermilion/vermilion.c | 1 - + drivers/video/of_display_timing.c | 3 +- + include/linux/font.h | 4 +- + include/video/of_display_timing.h | 16 + + lib/fonts/Kconfig | 9 + + lib/fonts/Makefile | 1 + + lib/fonts/font_6x10.c | 3086 ++++++++++++++++++++ + lib/fonts/fonts.c | 4 + + 39 files changed, 3421 insertions(+), 124 deletions(-) + create mode 100644 lib/fonts/font_6x10.c +Merging regulator/for-next (2ca781ca6135 Merge remote-tracking branch 'regulator/fix/rk808' into regulator-linus) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/rk808-regulator.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging security/next (594081ee7145 integrity: do zero padding of the key id) +$ git merge security/next +Resolved 'fs/nfsd/vfs.c' using previous resolution. +Resolved 'security/smack/smack_lsm.c' using previous resolution. +Auto-merging security/smack/smack_lsm.c +CONFLICT (content): Merge conflict in security/smack/smack_lsm.c +Auto-merging security/selinux/netif.c +Auto-merging security/selinux/hooks.c +Auto-merging security/keys/request_key.c +Auto-merging security/keys/key.c +Auto-merging net/rxrpc/ar-key.c +Auto-merging include/linux/security.h +Auto-merging include/linux/kernel.h +Auto-merging fs/nfsd/vfs.c +CONFLICT (content): Merge conflict in fs/nfsd/vfs.c +Auto-merging fs/namei.c +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0e875b764155] Merge remote-tracking branch 'security/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 2 +- + Documentation/security/keys.txt | 65 +++- + MAINTAINERS | 2 + + crypto/asymmetric_keys/asymmetric_keys.h | 5 +- + crypto/asymmetric_keys/asymmetric_type.c | 265 +++++++++++---- + crypto/asymmetric_keys/pkcs7_key_type.c | 2 - + crypto/asymmetric_keys/pkcs7_parser.c | 99 +++--- + crypto/asymmetric_keys/pkcs7_parser.h | 6 +- + crypto/asymmetric_keys/pkcs7_trust.c | 90 +++-- + crypto/asymmetric_keys/pkcs7_verify.c | 102 ++++-- + crypto/asymmetric_keys/signature.c | 1 + + crypto/asymmetric_keys/x509_cert_parser.c | 57 ++-- + crypto/asymmetric_keys/x509_parser.h | 8 +- + crypto/asymmetric_keys/x509_public_key.c | 115 ++++--- + fs/cifs/cifs_spnego.c | 1 - + fs/cifs/cifsacl.c | 1 - + fs/namei.c | 2 +- + fs/nfs/idmap.c | 2 - + fs/nfsd/vfs.c | 2 +- + include/crypto/public_key.h | 6 +- + include/keys/asymmetric-type.h | 41 +++ + include/keys/user-type.h | 1 - + include/linux/ima.h | 4 +- + include/linux/kernel.h | 1 + + include/linux/key-type.h | 34 +- + include/linux/security.h | 2 +- + lib/hexdump.c | 16 + + net/ceph/crypto.c | 1 - + net/dns_resolver/dns_key.c | 18 +- + net/rxrpc/ar-key.c | 2 - + security/integrity/Kconfig | 46 ++- + security/integrity/Makefile | 6 +- + security/integrity/digsig_asymmetric.c | 7 +- + security/integrity/evm/Kconfig | 8 - + security/integrity/evm/evm_main.c | 17 +- + security/integrity/ima/Kconfig | 2 - + security/integrity/ima/ima.h | 24 +- + security/integrity/ima/ima_api.c | 10 +- + security/integrity/ima/ima_appraise.c | 17 +- + security/integrity/ima/ima_crypto.c | 20 +- + security/integrity/ima/ima_init.c | 25 +- + security/integrity/ima/ima_main.c | 123 +++---- + security/integrity/ima/ima_policy.c | 23 ++ + security/integrity/ima/ima_template.c | 30 +- + security/integrity/integrity.h | 2 +- + security/keys/big_key.c | 2 - + security/keys/encrypted-keys/encrypted.c | 1 - + security/keys/internal.h | 21 +- + security/keys/key.c | 2 +- + security/keys/keyctl.c | 2 + + security/keys/keyring.c | 58 ++-- + security/keys/proc.c | 8 +- + security/keys/process_keys.c | 13 +- + security/keys/request_key.c | 21 +- + security/keys/request_key_auth.c | 10 +- + security/keys/trusted.c | 1 - + security/keys/user_defined.c | 14 - + security/selinux/hooks.c | 135 +++++--- + security/selinux/include/netif.h | 4 +- + security/selinux/include/objsec.h | 2 + + security/selinux/netif.c | 43 +-- + security/selinux/ss/services.c | 14 +- + security/smack/Kconfig | 16 + + security/smack/smack.h | 39 +-- + security/smack/smack_access.c | 118 +++---- + security/smack/smack_lsm.c | 545 +++++++++++++++++++++--------- + security/smack/smackfs.c | 76 +++-- + 67 files changed, 1593 insertions(+), 865 deletions(-) +Merging integrity/next (1b68bdf9cded ima: detect violations for mmaped files) +$ git merge integrity/next +Already up-to-date. +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 (199287dd27ef watchdog: Let XILINX_WATCHDOG and TEGRA_WATCHDOG depend on HAS_IOMEM) +$ git merge watchdog/master +Auto-merging drivers/watchdog/Kconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/watchdog/cadence-wdt.txt | 24 + + .../devicetree/bindings/watchdog/fsl-imx-wdt.txt | 3 +- + .../devicetree/bindings/watchdog/meson6-wdt.txt | 13 + + .../devicetree/bindings/watchdog/qcom-wdt.txt | 24 + + .../devicetree/bindings/watchdog/samsung-wdt.txt | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + drivers/watchdog/Kconfig | 54 ++- + drivers/watchdog/Makefile | 5 + + drivers/watchdog/booke_wdt.c | 28 +- + drivers/watchdog/cadence_wdt.c | 516 +++++++++++++++++++++ + drivers/watchdog/da9063_wdt.c | 191 ++++++++ + drivers/watchdog/dw_wdt.c | 36 +- + drivers/watchdog/imx2_wdt.c | 43 +- + drivers/watchdog/meson_wdt.c | 236 ++++++++++ + drivers/watchdog/of_xilinx_wdt.c | 1 - + drivers/watchdog/qcom-wdt.c | 224 +++++++++ + drivers/watchdog/rn5t618_wdt.c | 198 ++++++++ + drivers/watchdog/s3c2410_wdt.c | 47 ++ + drivers/watchdog/stmp3xxx_rtc_wdt.c | 24 + + drivers/watchdog/sunxi_wdt.c | 111 ++++- + drivers/watchdog/ts72xx_wdt.c | 6 +- + include/linux/watchdog.h | 9 +- + 22 files changed, 1725 insertions(+), 70 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/cadence-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/meson6-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.txt + create mode 100644 drivers/watchdog/cadence_wdt.c + create mode 100644 drivers/watchdog/da9063_wdt.c + create mode 100644 drivers/watchdog/meson_wdt.c + create mode 100644 drivers/watchdog/qcom-wdt.c + create mode 100644 drivers/watchdog/rn5t618_wdt.c +Merging iommu/next (09b5269a1b3d Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge iommu/next +Auto-merging virt/kvm/iommu.c +Auto-merging include/linux/device.h +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iommu/arm,smmu.txt | 1 + + drivers/base/core.c | 3 + + drivers/infiniband/hw/usnic/usnic_uiom.c | 2 +- + drivers/iommu/amd_iommu.c | 117 ++++++----- + drivers/iommu/amd_iommu_init.c | 21 +- + drivers/iommu/amd_iommu_types.h | 21 -- + drivers/iommu/arm-smmu.c | 220 ++++++++++++--------- + drivers/iommu/dmar.c | 25 ++- + drivers/iommu/exynos-iommu.c | 51 ++--- + drivers/iommu/fsl_pamu_domain.c | 5 +- + drivers/iommu/intel-iommu.c | 16 +- + drivers/iommu/intel_irq_remapping.c | 7 +- + drivers/iommu/iommu.c | 208 +++++++++++-------- + drivers/iommu/irq_remapping.c | 11 +- + drivers/iommu/irq_remapping.h | 2 +- + drivers/iommu/msm_iommu.c | 7 +- + drivers/iommu/omap-iommu.c | 27 +-- + drivers/iommu/omap-iommu.h | 1 - + drivers/iommu/tegra-gart.c | 9 +- + drivers/iommu/tegra-smmu.c | 9 +- + drivers/vfio/vfio_iommu_type1.c | 4 +- + include/linux/device.h | 11 +- + include/linux/dmar.h | 8 +- + include/linux/iommu.h | 25 ++- + virt/kvm/iommu.c | 6 +- + 25 files changed, 461 insertions(+), 356 deletions(-) +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 +Auto-merging include/linux/iommu.h +Auto-merging drivers/vfio/vfio_iommu_type1.c +Auto-merging drivers/pci/msi.c +Merge made by the 'recursive' strategy. + drivers/pci/msi.c | 2 + + drivers/vfio/pci/vfio_pci.c | 136 ++++++++++++++++---------------------- + drivers/vfio/pci/vfio_pci_intrs.c | 15 +++++ + drivers/vfio/vfio_iommu_type1.c | 30 +++++++-- + drivers/vfio/vfio_spapr_eeh.c | 2 +- + include/linux/iommu.h | 1 + + include/uapi/linux/vfio.h | 3 + + 7 files changed, 104 insertions(+), 85 deletions(-) +Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (7bb38d57fd75 Remove MN10300_PROC_MN2WS0038) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/master (29075feaf1f5 next: openrisc: Fix build) +$ git merge audit/master +Resolved 'arch/arm64/kernel/ptrace.c' using previous resolution. +Auto-merging kernel/auditsc.c +Auto-merging kernel/auditfilter.c +Auto-merging kernel/audit.c +Auto-merging include/uapi/linux/audit.h +Auto-merging arch/x86/kernel/entry_64.S +Auto-merging arch/x86/kernel/entry_32.S +Auto-merging arch/um/kernel/ptrace.c +Auto-merging arch/sparc/include/asm/thread_info_64.h +Auto-merging arch/s390/kernel/ptrace.c +Auto-merging arch/powerpc/kernel/ptrace.c +Auto-merging arch/parisc/kernel/ptrace.c +Auto-merging arch/mips/kernel/ptrace.c +Auto-merging arch/mips/include/asm/syscall.h +Auto-merging arch/arm64/kernel/ptrace.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/ptrace.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d08698b025ab] Merge remote-tracking branch 'audit/master' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/syscall.h | 11 +++++++++++ + arch/alpha/kernel/ptrace.c | 2 +- + arch/arm/kernel/ptrace.c | 4 ++-- + arch/arm64/kernel/ptrace.c | 4 ++-- + arch/ia64/include/asm/syscall.h | 6 ++++++ + arch/ia64/kernel/ptrace.c | 2 +- + arch/microblaze/include/asm/syscall.h | 5 +++++ + arch/microblaze/kernel/ptrace.c | 3 +-- + arch/mips/include/asm/syscall.h | 2 +- + arch/mips/kernel/ptrace.c | 4 +--- + arch/openrisc/include/asm/syscall.h | 5 +++++ + arch/openrisc/include/uapi/asm/elf.h | 3 +-- + arch/openrisc/kernel/ptrace.c | 3 +-- + arch/parisc/include/asm/syscall.h | 11 +++++++++++ + arch/parisc/kernel/ptrace.c | 9 +++------ + arch/powerpc/include/asm/syscall.h | 6 ++++++ + arch/powerpc/kernel/ptrace.c | 7 ++----- + arch/s390/kernel/ptrace.c | 4 +--- + arch/sh/include/asm/syscall_32.h | 10 ++++++++++ + arch/sh/include/asm/syscall_64.h | 14 ++++++++++++++ + arch/sh/kernel/ptrace_32.c | 14 +------------- + arch/sh/kernel/ptrace_64.c | 17 +---------------- + arch/sparc/include/asm/syscall.h | 7 +++++++ + arch/sparc/include/asm/thread_info_32.h | 2 ++ + arch/sparc/include/asm/thread_info_64.h | 2 ++ + arch/sparc/kernel/ptrace_64.c | 9 ++------- + arch/um/kernel/ptrace.c | 3 +-- + arch/x86/ia32/ia32entry.S | 12 ++++++------ + arch/x86/kernel/entry_32.S | 11 +++++------ + arch/x86/kernel/entry_64.S | 11 +++++------ + arch/x86/kernel/ptrace.c | 8 ++------ + arch/x86/um/asm/ptrace.h | 4 ---- + arch/x86/um/asm/syscall.h | 15 +++++++++++++++ + arch/xtensa/kernel/ptrace.c | 2 +- + include/asm-generic/syscall.h | 2 +- + include/linux/audit.h | 25 +++++++++++++++---------- + include/uapi/linux/audit.h | 14 +------------- + include/uapi/linux/elf-em.h | 1 + + kernel/audit.c | 30 ++++++++++-------------------- + kernel/audit.h | 1 - + kernel/audit_tree.c | 2 +- + kernel/audit_watch.c | 4 ++-- + kernel/auditfilter.c | 33 ++++++++++++++++++++++----------- + kernel/auditsc.c | 28 +++++++++------------------- + 44 files changed, 197 insertions(+), 175 deletions(-) + create mode 100644 arch/alpha/include/asm/syscall.h + create mode 100644 arch/x86/um/asm/syscall.h +Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (669a36302641 To remove non-ascii characters in of_selftest.txt) +$ git merge devicetree/devicetree/next +Merge made by the 'recursive' strategy. + .../devicetree/dynamic-resolution-notes.txt | 25 ++ + Documentation/devicetree/of_selftest.txt | 30 +- + drivers/of/Kconfig | 4 + + drivers/of/Makefile | 1 + + drivers/of/base.c | 3 + + drivers/of/resolver.c | 336 +++++++++++++++++++++ + drivers/of/selftest.c | 112 ++++++- + drivers/of/testcase-data/testcases.dts | 35 +++ + include/linux/of.h | 3 + + 9 files changed, 531 insertions(+), 18 deletions(-) + create mode 100644 Documentation/devicetree/dynamic-resolution-notes.txt + create mode 100644 drivers/of/resolver.c +Merging dt-rh/for-next (d22e9131187d of: add vendor prefix for Chipidea) +$ git merge dt-rh/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/vendor-prefixes.txt | 4 ++ + Documentation/devicetree/booting-without-of.txt | 53 ++++++++++++++++++++++ + 2 files changed, 57 insertions(+) +Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings) +$ git merge mailbox/mailbox-for-next +Auto-merging drivers/cpufreq/highbank-cpufreq.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mailbox/mailbox.txt | 38 ++ + Documentation/mailbox.txt | 122 ++++++ + MAINTAINERS | 8 + + arch/arm/mach-highbank/highbank.c | 2 +- + drivers/cpufreq/highbank-cpufreq.c | 2 +- + drivers/mailbox/Makefile | 4 + + drivers/mailbox/mailbox.c | 465 +++++++++++++++++++++ + drivers/mailbox/pl320-ipc.c | 2 +- + include/linux/mailbox_client.h | 46 ++ + include/linux/mailbox_controller.h | 133 ++++++ + include/linux/{mailbox.h => pl320-ipc.h} | 0 + 11 files changed, 819 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/mailbox.txt + create mode 100644 Documentation/mailbox.txt + create mode 100644 drivers/mailbox/mailbox.c + create mode 100644 include/linux/mailbox_client.h + create mode 100644 include/linux/mailbox_controller.h + rename include/linux/{mailbox.h => pl320-ipc.h} (100%) +Merging spi/for-next (a2285b8c75bf Merge remote-tracking branch 'spi/topic/xilinx' into spi-next) +$ git merge spi/for-next +Already up-to-date. +Merging tip/auto-latest (acb4f4ad94bf Merge branch 'x86/vdso') +$ git merge tip/auto-latest +Resolved 'arch/x86/kernel/entry_64.S' using previous resolution. +Resolved 'arch/x86/kernel/ptrace.c' using previous resolution. +Auto-merging lib/Kconfig.debug +Auto-merging kernel/seccomp.c +Auto-merging kernel/sched/core.c +Auto-merging init/Kconfig +Auto-merging include/linux/wait.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/lockdep.h +Auto-merging fs/nfsd/nfs4recover.c +CONFLICT (modify/delete): fs/nfs/blocklayout/blocklayoutdm.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of fs/nfs/blocklayout/blocklayoutdm.c left in tree. +CONFLICT (modify/delete): fs/nfs/blocklayout/blocklayoutdev.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of fs/nfs/blocklayout/blocklayoutdev.c left in tree. +Auto-merging fs/file.c +Auto-merging drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c +Auto-merging drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/md/dm-bufio.c +Auto-merging drivers/gpu/drm/drm_modeset_lock.c +Removing arch/x86/lib/rwlock.S +Auto-merging arch/x86/kernel/ptrace.c +CONFLICT (content): Merge conflict in arch/x86/kernel/ptrace.c +Removing arch/x86/kernel/preempt.S +Auto-merging arch/x86/kernel/entry_64.S +CONFLICT (content): Merge conflict in arch/x86/kernel/entry_64.S +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/kernel/cpu/Makefile +Removing arch/x86/include/asm/rwlock.h +Auto-merging arch/x86/include/asm/cpufeature.h +Auto-merging arch/x86/ia32/ia32entry.S +Auto-merging arch/x86/boot/compressed/aslr.c +Auto-merging arch/x86/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/kernel/smp_64.c +Auto-merging arch/s390/kernel/ptrace.c +Auto-merging arch/s390/include/asm/cputime.h +Auto-merging arch/powerpc/mm/fault.c +Auto-merging arch/mips/kernel/ptrace.c +Auto-merging arch/arm/kernel/ptrace.c +Auto-merging arch/arc/include/asm/atomic.h +Auto-merging MAINTAINERS +Auto-merging Documentation/locking/spinlocks.txt +Auto-merging Documentation/locking/mutex-design.txt +Auto-merging Documentation/locking/lockstat.txt +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/nfs/blocklayout/blocklayoutdev.c fs/nfs/blocklayout/blocklayoutdm.c +fs/nfs/blocklayout/blocklayoutdev.c: needs merge +fs/nfs/blocklayout/blocklayoutdm.c: needs merge +rm 'fs/nfs/blocklayout/blocklayoutdev.c' +rm 'fs/nfs/blocklayout/blocklayoutdm.c' +$ git commit -v -a +[master b6bfa45a8fd3] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/00-INDEX | 2 + + Documentation/DocBook/kernel-locking.tmpl | 2 +- + Documentation/RCU/stallwarn.txt | 33 +- + Documentation/kernel-parameters.txt | 68 +- + Documentation/{ => locking}/lockdep-design.txt | 0 + Documentation/{ => locking}/lockstat.txt | 2 +- + Documentation/locking/locktorture.txt | 142 + + Documentation/{ => locking}/mutex-design.txt | 6 +- + Documentation/{ => locking}/rt-mutex-design.txt | 0 + Documentation/{ => locking}/rt-mutex.txt | 0 + Documentation/{ => locking}/spinlocks.txt | 14 +- + Documentation/{ => locking}/ww-mutex-design.txt | 0 + Documentation/memory-barriers.txt | 128 +- + Documentation/scheduler/sched-deadline.txt | 340 +- + Documentation/x86/x86_64/mm.txt | 2 +- + MAINTAINERS | 4 +- + arch/Kconfig | 11 + + arch/alpha/include/asm/atomic.h | 217 +- + arch/arc/include/asm/atomic.h | 184 +- + arch/arm/include/asm/atomic.h | 307 +- + arch/arm/kernel/ptrace.c | 7 +- + arch/arm/kernel/topology.c | 4 +- + arch/arm64/include/asm/atomic.h | 201 +- + arch/avr32/include/asm/atomic.h | 125 +- + arch/cris/arch-v10/drivers/sync_serial.c | 1 - + arch/cris/arch-v32/drivers/sync_serial.c | 1 - + arch/cris/include/asm/atomic.h | 59 +- + arch/frv/include/asm/atomic.h | 2 +- + arch/hexagon/include/asm/atomic.h | 68 +- + arch/ia64/include/asm/atomic.h | 192 +- + arch/ia64/include/asm/processor.h | 1 - + arch/m32r/include/asm/atomic.h | 145 +- + arch/m68k/include/asm/atomic.h | 111 +- + arch/metag/include/asm/atomic_lnkget.h | 121 +- + arch/metag/include/asm/atomic_lock1.h | 76 +- + arch/mips/include/asm/atomic.h | 561 ++-- + arch/mips/include/asm/processor.h | 6 - + arch/mips/kernel/ptrace.c | 2 +- + arch/mn10300/include/asm/atomic.h | 125 +- + arch/parisc/include/asm/atomic.h | 117 +- + arch/powerpc/include/asm/atomic.h | 198 +- + arch/powerpc/include/asm/cputime.h | 2 + + arch/powerpc/mm/fault.c | 5 +- + arch/s390/include/asm/cputime.h | 2 + + arch/s390/kernel/ptrace.c | 2 +- + arch/sh/include/asm/atomic-grb.h | 119 +- + arch/sh/include/asm/atomic-irq.h | 62 +- + arch/sh/include/asm/atomic-llsc.h | 101 +- + arch/sh/include/asm/atomic.h | 2 +- + arch/sparc/include/asm/atomic_32.h | 19 +- + arch/sparc/include/asm/atomic_64.h | 49 +- + arch/sparc/kernel/smp_64.c | 2 +- + arch/sparc/lib/atomic32.c | 29 +- + arch/sparc/lib/atomic_64.S | 163 +- + arch/sparc/lib/ksyms.c | 25 +- + arch/um/drivers/random.c | 1 - + arch/x86/Kconfig | 35 +- + arch/x86/Makefile | 8 +- + arch/x86/boot/compressed/aslr.c | 2 +- + arch/x86/boot/mkcpustr.c | 1 + + arch/x86/ia32/ia32entry.S | 18 +- + arch/x86/include/asm/atomic.h | 17 +- + arch/x86/include/asm/atomic64_64.h | 2 +- + arch/x86/include/asm/calling.h | 6 +- + arch/x86/include/asm/cpufeature.h | 52 +- + arch/x86/include/asm/disabled-features.h | 39 + + arch/x86/include/asm/elf.h | 5 +- + arch/x86/include/asm/fpu-internal.h | 2 +- + arch/x86/include/asm/microcode_intel.h | 2 +- + arch/x86/include/asm/numa.h | 1 - + arch/x86/include/asm/perf_event.h | 8 + + arch/x86/include/asm/pgtable_32.h | 3 - + arch/x86/include/asm/pgtable_64.h | 3 +- + arch/x86/include/asm/ptrace.h | 5 + + arch/x86/include/asm/rwlock.h | 49 - + arch/x86/include/asm/serial.h | 24 +- + arch/x86/include/asm/spinlock.h | 81 +- + arch/x86/include/asm/spinlock_types.h | 4 - + arch/x86/include/uapi/asm/e820.h | 5 - + arch/x86/kernel/Makefile | 2 - + arch/x86/kernel/apic/apic_numachip.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 2 - + arch/x86/kernel/cpu/Makefile | 4 +- + arch/x86/kernel/cpu/common.c | 33 +- + arch/x86/kernel/cpu/intel.c | 32 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 4 +- + arch/x86/kernel/cpu/microcode/amd_early.c | 2 +- + arch/x86/kernel/cpu/microcode/intel.c | 4 +- + arch/x86/kernel/cpu/microcode/intel_early.c | 10 +- + arch/x86/kernel/cpu/mtrr/main.c | 6 +- + arch/x86/kernel/cpu/perf_event.c | 14 +- + arch/x86/kernel/cpu/perf_event.h | 49 +- + arch/x86/kernel/cpu/perf_event_intel.c | 229 +- + arch/x86/kernel/cpu/perf_event_intel_ds.c | 185 +- + arch/x86/kernel/cpu/perf_event_intel_lbr.c | 8 +- + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 3297 +------------------- + arch/x86/kernel/cpu/perf_event_intel_uncore.h | 439 +-- + .../x86/kernel/cpu/perf_event_intel_uncore_nhmex.c | 1221 ++++++++ + arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 636 ++++ + .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 2258 ++++++++++++++ + arch/x86/kernel/e820.c | 7 +- + arch/x86/kernel/entry_64.S | 50 +- + arch/x86/kernel/iosf_mbi.c | 91 + + arch/x86/kernel/machine_kexec_32.c | 3 +- + arch/x86/kernel/pmc_atom.c | 11 +- + arch/x86/kernel/preempt.S | 25 - + arch/x86/kernel/process.c | 16 +- + arch/x86/kernel/process_32.c | 6 +- + arch/x86/kernel/process_64.c | 3 - + arch/x86/kernel/ptrace.c | 161 +- + arch/x86/kernel/quirks.c | 18 + + arch/x86/kernel/setup.c | 9 + + arch/x86/kernel/signal.c | 5 + + arch/x86/kernel/smpboot.c | 176 +- + arch/x86/kernel/vsyscall_64.c | 2 +- + arch/x86/kernel/xsave.c | 7 +- + arch/x86/lib/Makefile | 3 +- + arch/x86/lib/cmpxchg16b_emu.S | 32 +- + arch/x86/lib/cmpxchg8b_emu.S | 20 +- + arch/x86/lib/rwlock.S | 44 - + arch/x86/lib/thunk_32.S | 41 +- + arch/x86/lib/thunk_64.S | 7 + + arch/x86/mm/fault.c | 7 +- + arch/x86/mm/init_64.c | 36 +- + arch/x86/mm/numa.c | 34 +- + arch/x86/mm/pgtable_32.c | 35 - + arch/x86/tools/relocs.c | 2 +- + arch/x86/vdso/vdso2c.h | 12 +- + arch/x86/xen/smp.c | 2 + + arch/xtensa/include/asm/atomic.h | 235 +- + drivers/cpuidle/cpuidle.c | 15 +- + drivers/gpu/drm/drm_modeset_lock.c | 2 +- + drivers/gpu/vga/vgaarb.c | 1 - + drivers/md/dm-bufio.c | 1 - + drivers/parisc/power.c | 1 - + drivers/s390/net/claw.c | 2 - + drivers/scsi/fcoe/fcoe.c | 1 - + drivers/scsi/qla2xxx/qla_os.c | 1 - + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 3 - + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 1 - + drivers/staging/lustre/lustre/libcfs/fail.c | 1 - + drivers/tty/bfin_jtag_comm.c | 1 - + fs/afs/vlocation.c | 1 - + fs/file.c | 2 +- + fs/jfs/jfs_logmgr.c | 2 - + fs/jfs/jfs_txnmgr.c | 3 - + fs/nfsd/nfs4recover.c | 1 - + include/asm-generic/atomic.h | 194 +- + include/asm-generic/atomic64.h | 20 +- + include/asm-generic/cputime_jiffies.h | 2 + + include/asm-generic/cputime_nsecs.h | 2 + + include/linux/atomic.h | 36 - + include/linux/bitops.h | 20 - + include/linux/cpu.h | 2 + + include/linux/init_task.h | 12 +- + include/linux/jump_label.h | 17 +- + include/linux/lockdep.h | 3 +- + include/linux/mutex.h | 4 +- + include/linux/pci_ids.h | 2 + + include/linux/perf_event.h | 14 +- + include/linux/rcupdate.h | 106 +- + include/linux/rcutiny.h | 2 +- + include/linux/rwsem.h | 2 +- + include/linux/sched.h | 45 +- + include/linux/seccomp.h | 25 +- + include/linux/seqlock.h | 19 + + include/linux/smp.h | 2 + + include/linux/spinlock.h | 8 +- + include/linux/torture.h | 5 +- + include/linux/wait.h | 16 +- + include/trace/events/rcu.h | 3 + + init/Kconfig | 14 +- + init/main.c | 2 + + kernel/cpu.c | 16 +- + kernel/events/callchain.c | 2 +- + kernel/events/core.c | 212 +- + kernel/exit.c | 50 +- + kernel/fork.c | 13 +- + kernel/locking/locktorture.c | 392 ++- + kernel/locking/mcs_spinlock.h | 3 - + kernel/locking/mutex.c | 416 +-- + kernel/locking/mutex.h | 2 +- + kernel/locking/rtmutex.c | 2 +- + kernel/locking/rwsem-xadd.c | 27 +- + kernel/locking/semaphore.c | 12 +- + kernel/rcu/rcutorture.c | 278 +- + kernel/rcu/tiny.c | 20 +- + kernel/rcu/tree.c | 115 +- + kernel/rcu/tree.h | 18 +- + kernel/rcu/tree_plugin.h | 404 ++- + kernel/rcu/update.c | 345 +- + kernel/sched/auto_group.c | 5 +- + kernel/sched/core.c | 311 +- + kernel/sched/cpudeadline.c | 4 +- + kernel/sched/cputime.c | 64 +- + kernel/sched/deadline.c | 33 +- + kernel/sched/debug.c | 13 +- + kernel/sched/fair.c | 479 +-- + kernel/sched/idle.c | 6 + + kernel/sched/rt.c | 21 +- + kernel/sched/sched.h | 80 +- + kernel/sched/stop_task.c | 2 +- + kernel/seccomp.c | 252 +- + kernel/smp.c | 22 + + kernel/softirq.c | 2 +- + kernel/sys.c | 2 - + kernel/sysctl.c | 9 - + kernel/time/hrtimer.c | 1 - + kernel/time/posix-cpu-timers.c | 14 - + kernel/torture.c | 32 +- + kernel/trace/ring_buffer_benchmark.c | 3 - + kernel/trace/trace_stack.c | 4 +- + kernel/watchdog.c | 10 +- + lib/Kconfig.debug | 16 +- + lib/atomic64.c | 83 +- + mm/mlock.c | 2 +- + mm/page_alloc.c | 2 + + tools/lib/api/Makefile | 7 +- + tools/lib/api/fd/array.c | 127 + + tools/lib/api/fd/array.h | 46 + + tools/perf/.gitignore | 1 + + tools/perf/Documentation/perf-probe.txt | 3 + + tools/perf/Documentation/perf-report.txt | 5 +- + tools/perf/Documentation/perf-top.txt | 9 + + tools/perf/Makefile.perf | 11 +- + tools/perf/arch/arm/tests/dwarf-unwind.c | 1 + + tools/perf/arch/arm/util/unwind-libunwind.c | 1 + + tools/perf/arch/arm64/include/perf_regs.h | 2 + + tools/perf/arch/arm64/util/unwind-libunwind.c | 1 + + tools/perf/arch/common.c | 9 + + tools/perf/arch/powerpc/Makefile | 2 +- + tools/perf/arch/powerpc/util/skip-callchain-idx.c | 1 + + tools/perf/bench/futex-hash.c | 7 +- + tools/perf/bench/futex-requeue.c | 28 +- + tools/perf/bench/futex-wake.c | 15 +- + tools/perf/bench/sched-messaging.c | 2 +- + tools/perf/builtin-annotate.c | 77 +- + tools/perf/builtin-buildid-cache.c | 44 +- + tools/perf/builtin-diff.c | 6 +- + tools/perf/builtin-evlist.c | 2 +- + tools/perf/builtin-help.c | 20 +- + tools/perf/builtin-inject.c | 33 +- + tools/perf/builtin-kmem.c | 56 +- + tools/perf/builtin-kvm.c | 98 +- + tools/perf/builtin-lock.c | 7 +- + tools/perf/builtin-mem.c | 6 +- + tools/perf/builtin-probe.c | 10 +- + tools/perf/builtin-record.c | 146 +- + tools/perf/builtin-report.c | 23 +- + tools/perf/builtin-sched.c | 9 +- + tools/perf/builtin-script.c | 74 +- + tools/perf/builtin-stat.c | 11 +- + tools/perf/builtin-timechart.c | 8 +- + tools/perf/builtin-top.c | 87 +- + tools/perf/builtin-trace.c | 57 +- + tools/perf/config/Makefile | 52 +- + tools/perf/config/feature-checks/Makefile | 18 +- + tools/perf/config/utilities.mak | 2 +- + tools/perf/perf-with-kcore.sh | 259 ++ + tools/perf/perf.c | 10 +- + tools/perf/perf.h | 3 - + tools/perf/tests/builtin-test.c | 18 +- + tools/perf/tests/fdarray.c | 174 ++ + tools/perf/tests/mmap-basic.c | 7 +- + tools/perf/tests/open-syscall-all-cpus.c | 5 +- + tools/perf/tests/open-syscall-tp-fields.c | 9 +- + tools/perf/tests/open-syscall.c | 3 +- + tools/perf/tests/perf-record.c | 15 +- + tools/perf/tests/pmu.c | 2 +- + tools/perf/tests/rdpmc.c | 6 +- + tools/perf/tests/sw-clock.c | 6 +- + tools/perf/tests/switch-tracking.c | 572 ++++ + tools/perf/tests/task-exit.c | 8 +- + tools/perf/tests/tests.h | 3 + + tools/perf/ui/browsers/hists.c | 384 +-- + tools/perf/ui/gtk/hists.c | 18 +- + tools/perf/ui/hist.c | 284 +- + tools/perf/ui/stdio/hist.c | 4 +- + tools/perf/util/annotate.c | 21 +- + tools/perf/util/cache.h | 1 + + tools/perf/util/callchain.c | 240 +- + tools/perf/util/callchain.h | 6 +- + tools/perf/util/cloexec.c | 35 +- + tools/perf/util/color.c | 16 + + tools/perf/util/color.h | 1 + + tools/perf/util/comm.c | 7 +- + tools/perf/util/comm.h | 6 +- + tools/perf/util/config.c | 40 +- + tools/perf/util/data.c | 8 +- + tools/perf/util/debug.c | 36 +- + tools/perf/util/debug.h | 11 + + tools/perf/util/dso.c | 121 +- + tools/perf/util/dso.h | 16 +- + tools/perf/util/event.c | 14 +- + tools/perf/util/event.h | 2 + + tools/perf/util/evlist.c | 236 +- + tools/perf/util/evlist.h | 21 +- + tools/perf/util/evsel.c | 67 +- + tools/perf/util/evsel.h | 2 + + tools/perf/util/header.c | 32 +- + tools/perf/util/hist.c | 22 + + tools/perf/util/hist.h | 18 +- + tools/perf/util/kvm-stat.h | 1 - + tools/perf/util/machine.c | 96 +- + tools/perf/util/machine.h | 26 +- + tools/perf/util/map.c | 1 + + tools/perf/util/ordered-events.c | 245 ++ + tools/perf/util/ordered-events.h | 51 + + tools/perf/util/parse-events.c | 29 +- + tools/perf/util/parse-events.y | 10 + + tools/perf/util/pmu.c | 121 +- + tools/perf/util/pmu.h | 25 +- + tools/perf/util/probe-event.c | 181 +- + tools/perf/util/probe-event.h | 3 +- + tools/perf/util/probe-finder.c | 23 +- + tools/perf/util/python.c | 6 +- + tools/perf/util/record.c | 40 +- + tools/perf/util/run-command.c | 9 +- + .../perf/util/scripting-engines/trace-event-perl.c | 6 + + .../util/scripting-engines/trace-event-python.c | 120 +- + tools/perf/util/session.c | 300 +- + tools/perf/util/session.h | 32 +- + tools/perf/util/sort.c | 119 +- + tools/perf/util/sort.h | 1 + + tools/perf/util/symbol-elf.c | 31 +- + tools/perf/util/symbol.c | 43 +- + tools/perf/util/symbol.h | 14 +- + tools/perf/util/thread.c | 24 +- + tools/perf/util/thread.h | 10 +- + tools/perf/util/tool.h | 2 +- + tools/perf/util/trace-event-scripting.c | 7 + + tools/perf/util/trace-event.h | 1 + + tools/perf/util/util.c | 54 +- + tools/perf/util/util.h | 23 +- + .../selftests/rcutorture/bin/config2frag.sh | 4 +- + .../selftests/rcutorture/bin/configcheck.sh | 4 +- + .../testing/selftests/rcutorture/bin/configinit.sh | 4 +- + .../testing/selftests/rcutorture/bin/functions.sh | 20 + + .../testing/selftests/rcutorture/bin/kvm-build.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck-lock.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 5 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 6 +- + .../selftests/rcutorture/bin/parse-build.sh | 5 +- + .../selftests/rcutorture/bin/parse-console.sh | 9 +- + .../selftests/rcutorture/bin/parse-torture.sh | 5 +- + .../selftests/rcutorture/configs/lock/CFLIST | 2 + + .../selftests/rcutorture/configs/lock/LOCK02 | 6 + + .../selftests/rcutorture/configs/lock/LOCK02.boot | 1 + + .../selftests/rcutorture/configs/lock/LOCK03 | 6 + + .../selftests/rcutorture/configs/lock/LOCK03.boot | 1 + + .../rcutorture/configs/lock/ver_functions.sh | 2 +- + .../selftests/rcutorture/configs/rcu/CFLIST | 3 + + .../selftests/rcutorture/configs/rcu/TASKS01 | 9 + + .../selftests/rcutorture/configs/rcu/TASKS01.boot | 1 + + .../selftests/rcutorture/configs/rcu/TASKS02 | 5 + + .../selftests/rcutorture/configs/rcu/TASKS02.boot | 1 + + .../selftests/rcutorture/configs/rcu/TASKS03 | 13 + + .../selftests/rcutorture/configs/rcu/TASKS03.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE01 | 4 +- + .../selftests/rcutorture/configs/rcu/TREE01.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE07 | 3 +- + .../selftests/rcutorture/configs/rcu/TREE07.boot | 1 + + .../rcutorture/configs/rcu/ver_functions.sh | 2 +- + tools/testing/selftests/rcutorture/doc/initrd.txt | 1 + + 366 files changed, 14580 insertions(+), 9593 deletions(-) + rename Documentation/{ => locking}/lockdep-design.txt (100%) + rename Documentation/{ => locking}/lockstat.txt (99%) + create mode 100644 Documentation/locking/locktorture.txt + rename Documentation/{ => locking}/mutex-design.txt (97%) + rename Documentation/{ => locking}/rt-mutex-design.txt (100%) + rename Documentation/{ => locking}/rt-mutex.txt (100%) + rename Documentation/{ => locking}/spinlocks.txt (98%) + rename Documentation/{ => locking}/ww-mutex-design.txt (100%) + create mode 100644 arch/x86/include/asm/disabled-features.h + delete mode 100644 arch/x86/include/asm/rwlock.h + create mode 100644 arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c + create mode 100644 arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c + create mode 100644 arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c + delete mode 100644 arch/x86/kernel/preempt.S + delete mode 100644 arch/x86/lib/rwlock.S + create mode 100644 tools/lib/api/fd/array.c + create mode 100644 tools/lib/api/fd/array.h + create mode 100644 tools/perf/perf-with-kcore.sh + create mode 100644 tools/perf/tests/fdarray.c + create mode 100644 tools/perf/tests/switch-tracking.c + create mode 100644 tools/perf/util/ordered-events.c + create mode 100644 tools/perf/util/ordered-events.h + mode change 100644 => 100755 tools/testing/selftests/rcutorture/bin/config2frag.sh + mode change 100644 => 100755 tools/testing/selftests/rcutorture/bin/kvm.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK02 + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK02.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK03 + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK03.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TASKS01 + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TASKS01.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TASKS02 + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TASKS02.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TASKS03 + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TASKS03.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE07.boot +$ git am -3 ../patches/0001-pnfs-merge-fixup-for-sched-cleanup-of-set_current_st.patch +Applying: pnfs: merge fixup for sched cleanup of set_current_state(TASK_RUNNING) +$ git reset HEAD^ +Unstaged changes after reset: +M fs/nfs/blocklayout/rpc_pipefs.c +$ git add -A . +$ git commit -v -a --amend +[master 9888e8d5aaed] Merge remote-tracking branch 'tip/auto-latest' + Date: Fri Oct 10 14:07:02 2014 +1100 +Merging clockevents/clockevents/next (3252a646aa2c clocksource: exynos_mct: Only use 32-bits where possible) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (d0585cd815fa sb_edac: Claim a different PCI device) +$ git merge edac/linux_next +Auto-merging include/linux/pci_ids.h +Merge made by the 'recursive' strategy. + drivers/edac/sb_edac.c | 40 +++++++--------------------------------- + include/linux/pci_ids.h | 15 +++++++++++++++ + 2 files changed, 22 insertions(+), 33 deletions(-) +Merging edac-amd/for-next (a18c3f16a907 mpc85xx_edac: Make L2 interrupt shared too) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (3bbccffba8d5 Merge branch 'irqchip/core' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Auto-merging drivers/irqchip/irq-armada-370-xp.c +Merge made by the 'recursive' strategy. + drivers/irqchip/irq-armada-370-xp.c | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 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 +Resolved 'mm/Makefile' using previous resolution. +Auto-merging mm/Makefile +CONFLICT (content): Merge conflict in mm/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 82a9137fb4e6] Merge remote-tracking branch 'tiny/tiny/next' +$ git diff -M --stat --summary HEAD^.. +Merging ftrace/for-next (70c738a64478 Merge branch 'trace/ftrace/testing' into trace/for-next) +$ git merge ftrace/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + include/linux/ftrace.h | 10 +- + include/linux/tracepoint.h | 11 + + kernel/trace/ftrace.c | 416 ++++++++++++--------- + kernel/trace/trace_events.c | 5 +- + kernel/trace/trace_selftest.c | 51 ++- + kernel/trace/trace_syscalls.c | 4 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/ftrace/Makefile | 7 + + tools/testing/selftests/ftrace/README | 82 ++++ + tools/testing/selftests/ftrace/ftracetest | 253 +++++++++++++ + tools/testing/selftests/ftrace/samples/fail.tc | 4 + + tools/testing/selftests/ftrace/samples/pass.tc | 3 + + .../testing/selftests/ftrace/samples/unresolved.tc | 4 + + .../selftests/ftrace/samples/unsupported.tc | 3 + + tools/testing/selftests/ftrace/samples/untested.tc | 3 + + tools/testing/selftests/ftrace/samples/xfail.tc | 3 + + .../selftests/ftrace/test.d/00basic/basic1.tc | 3 + + .../selftests/ftrace/test.d/00basic/basic2.tc | 7 + + .../selftests/ftrace/test.d/00basic/basic3.tc | 8 + + .../ftrace/test.d/kprobe/add_and_remove.tc | 11 + + .../selftests/ftrace/test.d/kprobe/busy_check.tc | 13 + + .../selftests/ftrace/test.d/kprobe/kprobe_args.tc | 16 + + .../ftrace/test.d/kprobe/kretprobe_args.tc | 15 + + tools/testing/selftests/ftrace/test.d/template | 9 + + 25 files changed, 747 insertions(+), 196 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/Makefile + create mode 100644 tools/testing/selftests/ftrace/README + create mode 100755 tools/testing/selftests/ftrace/ftracetest + create mode 100644 tools/testing/selftests/ftrace/samples/fail.tc + create mode 100644 tools/testing/selftests/ftrace/samples/pass.tc + create mode 100644 tools/testing/selftests/ftrace/samples/unresolved.tc + create mode 100644 tools/testing/selftests/ftrace/samples/unsupported.tc + create mode 100644 tools/testing/selftests/ftrace/samples/untested.tc + create mode 100644 tools/testing/selftests/ftrace/samples/xfail.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/00basic/basic1.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/00basic/basic2.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/00basic/basic3.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/template +Merging rcu/rcu/next (3e28e377204b workqueue: Use cond_resched_rcu_qs macro) +$ git merge rcu/rcu/next +Merge made by the 'recursive' strategy. + Documentation/locking/locktorture.txt | 5 + + kernel/locking/locktorture.c | 141 ++++++++++++++++++--- + kernel/workqueue.c | 5 +- + .../selftests/rcutorture/configs/lock/CFLIST | 1 + + .../selftests/rcutorture/configs/lock/LOCK04 | 6 + + .../selftests/rcutorture/configs/lock/LOCK04.boot | 1 + + 6 files changed, 140 insertions(+), 19 deletions(-) + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK04 + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK04.boot +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 (da01e61428aa Merge tag 'f2fs-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (0496daa5cf99 arm/arm64: KVM: Report correct FSC for unsupported fault types) +$ 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 (95afae481414 xen: remove DEFINE_XENBUS_DRIVER() macro) +$ git merge xen-tip/linux-next +Auto-merging drivers/tty/hvc/hvc_xen.c +Auto-merging drivers/scsi/Kconfig +Auto-merging drivers/block/xen-blkfront.c +Auto-merging drivers/block/xen-blkback/xenbus.c +Auto-merging arch/x86/xen/smp.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 + + arch/arm/Kconfig | 2 +- + arch/arm64/Kconfig | 2 +- + arch/x86/include/asm/pgtable_types.h | 11 +- + arch/x86/mm/fault.c | 22 +- + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/pci/i386.c | 2 - + arch/x86/xen/efi.c | 2 + + arch/x86/xen/enlighten.c | 19 +- + arch/x86/xen/mmu.c | 48 +- + arch/x86/xen/p2m.c | 23 +- + arch/x86/xen/p2m.h | 15 + + arch/x86/xen/setup.c | 370 ++++- + arch/x86/xen/smp.c | 29 +- + arch/x86/xen/smp.h | 8 + + arch/x86/xen/xen-head.S | 36 + + drivers/block/xen-blkback/xenbus.c | 11 +- + drivers/block/xen-blkfront.c | 5 +- + drivers/char/tpm/xen-tpmfront.c | 13 +- + drivers/input/misc/xen-kbdfront.c | 5 +- + drivers/net/xen-netback/xenbus.c | 10 +- + drivers/net/xen-netfront.c | 16 +- + drivers/pci/xen-pcifront.c | 6 +- + drivers/scsi/Kconfig | 10 + + drivers/scsi/Makefile | 1 + + drivers/scsi/xen-scsifront.c | 1026 ++++++++++++++ + drivers/tty/hvc/hvc_xen.c | 9 +- + drivers/video/fbdev/xen-fbfront.c | 5 +- + drivers/xen/Kconfig | 9 + + drivers/xen/Makefile | 1 + + drivers/xen/efi.c | 2 + + drivers/xen/events/events_base.c | 5 +- + drivers/xen/grant-table.c | 2 +- + drivers/xen/xen-pciback/xenbus.c | 6 +- + drivers/xen/xen-scsiback.c | 2126 ++++++++++++++++++++++++++++ + drivers/xen/xenbus/xenbus_client.c | 9 +- + drivers/xen/xenbus/xenbus_probe.c | 6 +- + drivers/xen/xenbus/xenbus_probe.h | 4 +- + drivers/xen/xenbus/xenbus_probe_backend.c | 8 +- + drivers/xen/xenbus/xenbus_probe_frontend.c | 8 +- + include/xen/events.h | 2 + + include/xen/interface/elfnote.h | 48 +- + include/xen/interface/io/vscsiif.h | 229 +++ + include/xen/interface/xen.h | 272 +++- + include/xen/xenbus.h | 21 +- + 46 files changed, 4214 insertions(+), 263 deletions(-) + create mode 100644 arch/x86/xen/p2m.h + create mode 100644 drivers/scsi/xen-scsifront.c + create mode 100644 drivers/xen/xen-scsiback.c + create mode 100644 include/xen/interface/io/vscsiif.h +Merging percpu/for-next (0a15cbdaefcd Merge branch 'for-3.18' into for-next) +$ git merge percpu/for-next +Resolved 'arch/s390/include/asm/cputime.h' using previous resolution. +Resolved 'arch/s390/kernel/irq.c' using previous resolution. +Resolved 'arch/s390/kernel/processor.c' using previous resolution. +Resolved 'arch/s390/kernel/vtime.c' using previous resolution. +Resolved 'fs/ext4/super.c' using previous resolution. +Resolved 'kernel/irq_work.c' using previous resolution. +Auto-merging net/sctp/protocol.c +Auto-merging net/ipv6/syncookies.c +Auto-merging net/ipv4/tcp_output.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/syncookies.c +Auto-merging net/ipv4/route.c +Auto-merging net/dccp/proto.c +Auto-merging net/core/skbuff.c +Auto-merging net/core/dev.c +Auto-merging mm/shmem.c +Auto-merging mm/backing-dev.c +Auto-merging kernel/watchdog.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/time/tick-sched.c +Auto-merging kernel/time/tick-common.c +Auto-merging kernel/time/hrtimer.c +Auto-merging kernel/softirq.c +Auto-merging kernel/smp.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/rt.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/deadline.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/irq_work.c +CONFLICT (content): Merge conflict in kernel/irq_work.c +Auto-merging kernel/irq/chip.c +Auto-merging kernel/events/core.c +Auto-merging kernel/events/callchain.c +Auto-merging include/net/snmp.h +Auto-merging include/linux/percpu-refcount.h +Auto-merging include/linux/blk-mq.h +Auto-merging fs/super.c +Auto-merging fs/ext4/super.c +CONFLICT (content): Merge conflict in fs/ext4/super.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext3/super.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging drivers/s390/cio/cio.c +Auto-merging drivers/net/ethernet/tile/tilepro.c +Auto-merging drivers/irqchip/irq-gic.c +Auto-merging block/blk-sysfs.c +Auto-merging block/blk-mq.c +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/kvm/mmu.c +Auto-merging arch/x86/kernel/cpu/perf_event_intel_lbr.c +Auto-merging arch/x86/kernel/cpu/perf_event_intel_ds.c +Auto-merging arch/x86/kernel/cpu/perf_event_intel.c +Auto-merging arch/x86/kernel/cpu/perf_event.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/tile/mm/init.c +Auto-merging arch/tile/kernel/time.c +Auto-merging arch/sparc/kernel/perf_event.c +Auto-merging arch/s390/kernel/vtime.c +CONFLICT (content): Merge conflict in arch/s390/kernel/vtime.c +Auto-merging arch/s390/kernel/time.c +Auto-merging arch/s390/kernel/processor.c +CONFLICT (content): Merge conflict in arch/s390/kernel/processor.c +Auto-merging arch/s390/kernel/nmi.c +Auto-merging arch/s390/kernel/kprobes.c +Auto-merging arch/s390/kernel/irq.c +CONFLICT (content): Merge conflict in arch/s390/kernel/irq.c +Auto-merging arch/s390/include/asm/irq.h +Auto-merging arch/s390/include/asm/cputime.h +CONFLICT (content): Merge conflict in arch/s390/include/asm/cputime.h +Auto-merging arch/powerpc/include/asm/cputime.h +Auto-merging arch/blackfin/mach-common/ints-priority.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master df2d4f67309e] Merge remote-tracking branch 'percpu/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/perf_event.c | 16 +- + arch/alpha/kernel/time.c | 6 +- + arch/arm/kernel/smp_twd.c | 12 +- + arch/avr32/kernel/kprobes.c | 2 +- + arch/blackfin/include/asm/ipipe.h | 2 +- + arch/blackfin/kernel/perf_event.c | 10 +- + arch/blackfin/mach-common/ints-priority.c | 8 +- + arch/blackfin/mach-common/smp.c | 2 +- + arch/ia64/include/asm/hw_irq.h | 2 +- + arch/ia64/include/asm/sn/arch.h | 4 +- + arch/ia64/include/asm/sn/nodepda.h | 2 +- + arch/ia64/include/asm/switch_to.h | 2 +- + arch/ia64/include/asm/uv/uv_hub.h | 2 +- + arch/ia64/kernel/irq.c | 2 +- + arch/ia64/kernel/irq_ia64.c | 4 +- + arch/ia64/kernel/kprobes.c | 6 +- + arch/ia64/kernel/mca.c | 16 +- + arch/ia64/kernel/process.c | 6 +- + arch/ia64/kernel/traps.c | 2 +- + arch/ia64/sn/kernel/setup.c | 2 +- + arch/ia64/sn/kernel/sn2/sn2_smp.c | 28 +- + arch/metag/kernel/perf/perf_event.c | 14 +- + arch/mips/cavium-octeon/octeon-irq.c | 30 +- + arch/mips/include/asm/fpu_emulator.h | 24 +- + arch/mips/kernel/kprobes.c | 6 +- + arch/mips/kernel/perf_event_mipsxx.c | 14 +- + arch/mips/kernel/smp-bmips.c | 2 +- + arch/mips/loongson/loongson-3/smp.c | 6 +- + arch/powerpc/include/asm/cputime.h | 6 +- + arch/s390/include/asm/irq.h | 2 +- + arch/s390/include/asm/percpu.h | 16 +- + arch/s390/kernel/kprobes.c | 8 +- + arch/s390/kernel/nmi.c | 10 +- + arch/s390/kernel/perf_cpum_cf.c | 22 +- + arch/s390/kernel/perf_cpum_sf.c | 16 +- + arch/s390/kernel/processor.c | 2 +- + arch/s390/kernel/time.c | 6 +- + arch/s390/oprofile/hwsampler.c | 2 +- + arch/sparc/include/asm/cpudata_32.h | 2 +- + arch/sparc/include/asm/cpudata_64.h | 2 +- + arch/sparc/kernel/kprobes.c | 6 +- + arch/sparc/kernel/leon_smp.c | 2 +- + arch/sparc/kernel/nmi.c | 16 +- + arch/sparc/kernel/pci_sun4v.c | 8 +- + arch/sparc/kernel/perf_event.c | 26 +- + arch/sparc/kernel/sun4d_smp.c | 2 +- + arch/sparc/kernel/time_64.c | 2 +- + arch/sparc/mm/tlb.c | 4 +- + arch/tile/include/asm/irqflags.h | 4 +- + arch/tile/include/asm/mmu_context.h | 6 +- + arch/tile/kernel/irq.c | 14 +- + arch/tile/kernel/messaging.c | 4 +- + arch/tile/kernel/perf_event.c | 12 +- + arch/tile/kernel/process.c | 2 +- + arch/tile/kernel/setup.c | 3 +- + arch/tile/kernel/single_step.c | 4 +- + arch/tile/kernel/smp.c | 2 +- + arch/tile/kernel/smpboot.c | 6 +- + arch/tile/kernel/time.c | 8 +- + arch/tile/mm/highmem.c | 2 +- + arch/tile/mm/init.c | 4 +- + arch/x86/include/asm/debugreg.h | 4 +- + arch/x86/include/asm/perf_event_p4.h | 2 +- + arch/x86/include/asm/uv/uv_hub.h | 12 +- + arch/x86/kernel/apb_timer.c | 4 +- + arch/x86/kernel/apic/apic.c | 4 +- + arch/x86/kernel/apic/x2apic_cluster.c | 2 +- + arch/x86/kernel/cpu/common.c | 6 +- + arch/x86/kernel/cpu/mcheck/mce-inject.c | 6 +- + arch/x86/kernel/cpu/mcheck/mce.c | 46 +-- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce_intel.c | 22 +- + arch/x86/kernel/cpu/perf_event.c | 22 +- + arch/x86/kernel/cpu/perf_event_amd.c | 4 +- + arch/x86/kernel/cpu/perf_event_intel.c | 18 +- + arch/x86/kernel/cpu/perf_event_intel_ds.c | 20 +- + arch/x86/kernel/cpu/perf_event_intel_lbr.c | 12 +- + arch/x86/kernel/cpu/perf_event_intel_rapl.c | 12 +- + arch/x86/kernel/cpu/perf_event_knc.c | 2 +- + arch/x86/kernel/cpu/perf_event_p4.c | 6 +- + arch/x86/kernel/hw_breakpoint.c | 8 +- + arch/x86/kernel/irq_64.c | 6 +- + arch/x86/kernel/kvm.c | 22 +- + arch/x86/kvm/mmu.c | 2 +- + arch/x86/kvm/svm.c | 6 +- + arch/x86/kvm/vmx.c | 10 +- + arch/x86/kvm/x86.c | 2 +- + arch/x86/mm/kmemcheck/kmemcheck.c | 14 +- + arch/x86/oprofile/nmi_int.c | 8 +- + arch/x86/oprofile/op_model_p4.c | 2 +- + arch/x86/platform/uv/uv_nmi.c | 40 +-- + arch/x86/platform/uv/uv_time.c | 2 +- + arch/x86/xen/enlighten.c | 4 +- + arch/x86/xen/multicalls.c | 8 +- + arch/x86/xen/spinlock.c | 2 +- + arch/x86/xen/time.c | 10 +- + block/blk-mq-sysfs.c | 6 + + block/blk-mq.c | 18 +- + block/blk-sysfs.c | 11 +- + drivers/char/random.c | 2 +- + drivers/clocksource/dummy_timer.c | 2 +- + drivers/clocksource/metag_generic.c | 2 +- + drivers/clocksource/qcom-timer.c | 2 +- + drivers/cpuidle/governors/ladder.c | 4 +- + drivers/cpuidle/governors/menu.c | 6 +- + drivers/irqchip/irq-gic.c | 10 +- + drivers/md/dm-stats.c | 2 +- + drivers/net/ethernet/tile/tilegx.c | 22 +- + drivers/net/ethernet/tile/tilepro.c | 8 +- + drivers/oprofile/cpu_buffer.c | 10 +- + drivers/oprofile/timer_int.c | 2 +- + drivers/s390/cio/ccwreq.c | 2 +- + drivers/s390/cio/chsc_sch.c | 2 +- + drivers/s390/cio/cio.c | 6 +- + drivers/s390/cio/device_fsm.c | 4 +- + drivers/s390/cio/eadm_sch.c | 2 +- + drivers/target/target_core_tpg.c | 3 +- + fs/aio.c | 4 +- + fs/btrfs/disk-io.c | 8 +- + fs/btrfs/extent-tree.c | 2 +- + fs/ext2/super.c | 6 +- + fs/ext3/super.c | 6 +- + fs/ext4/mballoc.c | 2 +- + fs/ext4/super.c | 11 +- + fs/file_table.c | 2 +- + fs/quota/dquot.c | 2 +- + fs/super.c | 3 +- + include/linux/blk-mq.h | 1 + + include/linux/cpumask.h | 11 + + include/linux/flex_proportions.h | 5 +- + include/linux/kernel_stat.h | 4 +- + include/linux/percpu-defs.h | 3 - + include/linux/percpu-refcount.h | 122 ++++--- + include/linux/percpu.h | 13 +- + include/linux/percpu_counter.h | 10 +- + include/linux/proportions.h | 5 +- + include/net/dst_ops.h | 2 +- + include/net/inet_frag.h | 2 +- + include/net/netfilter/nf_conntrack.h | 2 +- + include/net/snmp.h | 6 +- + kernel/cgroup.c | 7 +- + kernel/events/callchain.c | 4 +- + kernel/events/core.c | 24 +- + kernel/irq/chip.c | 2 +- + kernel/irq_work.c | 12 +- + kernel/printk/printk.c | 4 +- + kernel/sched/clock.c | 2 +- + kernel/sched/deadline.c | 2 +- + kernel/sched/fair.c | 2 +- + kernel/sched/rt.c | 2 +- + kernel/sched/sched.h | 4 +- + kernel/smp.c | 6 +- + kernel/softirq.c | 4 +- + kernel/taskstats.c | 2 +- + kernel/time/hrtimer.c | 22 +- + kernel/time/tick-broadcast.c | 2 +- + kernel/time/tick-common.c | 6 +- + kernel/time/tick-oneshot.c | 2 +- + kernel/time/tick-sched.c | 24 +- + kernel/time/timer.c | 2 +- + kernel/user-return-notifier.c | 4 +- + kernel/watchdog.c | 12 +- + lib/flex_proportions.c | 8 +- + lib/percpu-refcount.c | 305 +++++++++++----- + lib/percpu_counter.c | 20 +- + lib/proportions.c | 10 +- + mm/backing-dev.c | 4 +- + mm/mmap.c | 2 +- + mm/nommu.c | 2 +- + mm/page-writeback.c | 2 +- + mm/percpu-km.c | 16 +- + mm/percpu-vm.c | 162 ++------- + mm/percpu.c | 526 ++++++++++++++++++++++------ + mm/shmem.c | 2 +- + net/core/dev.c | 14 +- + net/core/drop_monitor.c | 2 +- + net/core/skbuff.c | 2 +- + net/dccp/proto.c | 2 +- + net/ipv4/route.c | 4 +- + net/ipv4/syncookies.c | 2 +- + net/ipv4/tcp.c | 6 +- + net/ipv4/tcp_memcontrol.c | 2 +- + net/ipv4/tcp_output.c | 2 +- + net/ipv6/syncookies.c | 2 +- + net/rds/ib_rdma.c | 2 +- + net/sctp/protocol.c | 2 +- + 186 files changed, 1436 insertions(+), 989 deletions(-) +$ git am -3 ../patches/0001-percpu_counter-fix-for-ext4-updates.patch +Applying: percpu_counter: fix for ext4 updates +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ext4/extents_status.c +$ git add -A . +$ git commit -v -a --amend +[master ed70d389ad66] Merge remote-tracking branch 'percpu/for-next' + Date: Fri Oct 10 14:40:03 2014 +1100 +$ git am -3 ../patches/0001-s390-fixup-for-Replace-__get_cpu_var-uses.patch +Applying: s390: fixup for Replace __get_cpu_var uses +$ git reset HEAD^ +Unstaged changes after reset: +M arch/s390/kernel/idle.c +$ git add -A . +$ git commit -v -a --amend +[master 63ff53bce905] Merge remote-tracking branch 'percpu/for-next' + Date: Fri Oct 10 14:40:03 2014 +1100 +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 (eabde0fa9670 toshiba_acpi: Adapt kbd_bl_timeout_store to the new kbd type) +$ git merge drivers-x86/for-next +Merge made by the 'recursive' strategy. + drivers/platform/x86/dell-wmi.c | 12 +- + drivers/platform/x86/eeepc-laptop.c | 206 ++++++------ + drivers/platform/x86/intel-rst.c | 23 +- + drivers/platform/x86/thinkpad_acpi.c | 44 +-- + drivers/platform/x86/toshiba_acpi.c | 606 ++++++++++++++++++++++------------- + 5 files changed, 522 insertions(+), 369 deletions(-) +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 (f5b313a2bcd4 Merge remote-tracking branch 'regmap/topic/cache' into regmap-next) +$ git merge regmap/for-next +Already up-to-date. +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 (a4c84e6aafda leds: gpio: cleanup the leds-gpio driver) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/led-class.c | 23 +++++++++-------------- + drivers/leds/led-core.c | 19 ++++++++++++++++++- + drivers/leds/leds-gpio-register.c | 5 ++++- + drivers/leds/leds-gpio.c | 14 ++++++-------- + drivers/leds/leds-lp3944.c | 3 ++- + drivers/leds/trigger/ledtrig-gpio.c | 2 +- + include/linux/leds.h | 16 +++++++++++++--- + 7 files changed, 53 insertions(+), 29 deletions(-) +Merging ipmi/for-next (bfe01a5ba249 Linux 3.17) +$ git merge ipmi/for-next +Already up-to-date. +Merging driver-core/driver-core-next (906d201530f2 dynamic_debug: change __dynamic_<foo>_dbg return types to void) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (69784fa539ef Revert "serial/core: Initialize the console pm state") +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (4ed9a3d45555 USB: host: st: fix typo 'CONFIG_USB_EHCI_HCD_ST') +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (72a65a0d19c1 Revert "usb: gadget: composite: dequeue cdev->req before free its buffer") +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (f8c0e057b489 USB: serial: remove zte_ev driver) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging staging/staging-next (80213c03c415 Merge tag 'pci-v3.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (480bd3c4ad30 mei: mei_txe_fw_sts can be static) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging cgroup/for-next (55e8955e6eba Merge branch 'for-3.18' into for-next) +$ git merge cgroup/for-next +Auto-merging kernel/events/core.c +Auto-merging kernel/cgroup.c +Auto-merging fs/proc/base.c +Merge made by the 'recursive' strategy. + fs/proc/base.c | 39 ++--------- + include/linux/cgroup.h | 26 ++----- + include/linux/cpuset.h | 3 +- + kernel/cgroup.c | 184 ++++++++++++++----------------------------------- + kernel/cpuset.c | 15 +--- + kernel/events/core.c | 7 +- + mm/memory-failure.c | 2 +- + 7 files changed, 71 insertions(+), 205 deletions(-) +Merging scsi/for-next (20c5ec4e6d71 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging target-updates/for-next (218285965f3f vhost-scsi: Take configfs group dependency during VHOST_SCSI_SET_ENDPOINT) +$ git merge target-updates/for-next +Resolved 'drivers/scsi/qla2xxx/qla_target.c' using previous resolution. +Auto-merging include/uapi/linux/Kbuild +Auto-merging drivers/target/target_core_tpg.c +Auto-merging drivers/target/target_core_pscsi.c +Auto-merging drivers/target/target_core_configfs.c +Auto-merging drivers/target/iscsi/iscsi_target_util.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c +Auto-merging drivers/scsi/qla2xxx/qla_target.h +Auto-merging drivers/scsi/qla2xxx/qla_target.c +CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_target.c +Auto-merging drivers/infiniband/ulp/isert/ib_isert.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b20e4d02c0e6] Merge remote-tracking branch 'target-updates/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/target/tcmu-design.txt | 378 +++++++++ + drivers/infiniband/ulp/isert/ib_isert.c | 6 +- + drivers/scsi/qla2xxx/qla_target.c | 35 +- + drivers/scsi/qla2xxx/qla_target.h | 12 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 11 +- + drivers/target/Kconfig | 7 + + drivers/target/Makefile | 1 + + drivers/target/iscsi/iscsi_target.c | 6 +- + drivers/target/iscsi/iscsi_target_configfs.c | 10 +- + drivers/target/iscsi/iscsi_target_erl0.c | 6 +- + drivers/target/iscsi/iscsi_target_login.c | 8 +- + drivers/target/iscsi/iscsi_target_util.c | 5 +- + drivers/target/loopback/tcm_loop.c | 29 +- + drivers/target/target_core_alua.c | 33 +- + drivers/target/target_core_configfs.c | 26 +- + drivers/target/target_core_device.c | 48 +- + drivers/target/target_core_fabric_configfs.c | 13 +- + drivers/target/target_core_fabric_lib.c | 6 +- + drivers/target/target_core_file.c | 13 +- + drivers/target/target_core_internal.h | 6 +- + drivers/target/target_core_pr.c | 107 +-- + drivers/target/target_core_pr.h | 2 +- + drivers/target/target_core_pscsi.c | 16 +- + drivers/target/target_core_sbc.c | 2 +- + drivers/target/target_core_tmr.c | 24 +- + drivers/target/target_core_tpg.c | 53 +- + drivers/target/target_core_transport.c | 27 +- + drivers/target/target_core_ua.c | 15 +- + drivers/target/target_core_ua.h | 1 + + drivers/target/target_core_user.c | 1167 ++++++++++++++++++++++++++ + drivers/target/tcm_fc/tfc_sess.c | 2 +- + drivers/uio/uio.c | 12 - + drivers/vhost/scsi.c | 22 + + include/linux/uio_driver.h | 12 +- + include/target/target_core_base.h | 17 + + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/target_core_user.h | 142 ++++ + 37 files changed, 1963 insertions(+), 318 deletions(-) + create mode 100644 Documentation/target/tcmu-design.txt + create mode 100644 drivers/target/target_core_user.c + create mode 100644 include/uapi/linux/target_core_user.h +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 (9a50aaefc1b8 Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge pinctrl/for-next +Already up-to-date. +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 61cc959ab1bd] 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 (a092e19b688b gpio: pch: Build context save/restore only for PM) +$ git merge gpio/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (b4bbb107d73b dma-mapping: Provide write-combine allocations) +$ git merge dma-mapping/dma-mapping-next +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/include/asm/dma-mapping.h | 16 ---------------- + arch/s390/Kconfig | 5 +---- + arch/s390/include/asm/dma-mapping.h | 31 +++++++++++++++++++++---------- + include/asm-generic/dma-mapping-common.h | 8 -------- + include/linux/dma-mapping.h | 26 ++++++++++++++++++++++++++ + 5 files changed, 48 insertions(+), 38 deletions(-) +Merging pwm/for-next (e2e08970100d pwm: atmel: Fix calculation of prescale value) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/pwm-fsl-ftm.txt | 19 ++- + .../devicetree/bindings/pwm/pwm-rockchip.txt | 4 +- + drivers/pwm/Kconfig | 21 +++- + drivers/pwm/Makefile | 2 + + drivers/pwm/core.c | 31 +++-- + drivers/pwm/pwm-atmel.c | 24 ++-- + drivers/pwm/pwm-fsl-ftm.c | 90 +++++++------- + drivers/pwm/pwm-imx.c | 71 ++++++++--- + drivers/pwm/pwm-lpss-pci.c | 64 ++++++++++ + drivers/pwm/pwm-lpss-platform.c | 68 ++++++++++ + drivers/pwm/pwm-lpss.c | 137 +++------------------ + drivers/pwm/pwm-lpss.h | 32 +++++ + drivers/pwm/pwm-rockchip.c | 57 +++++++-- + 13 files changed, 398 insertions(+), 222 deletions(-) + create mode 100644 drivers/pwm/pwm-lpss-pci.c + create mode 100644 drivers/pwm/pwm-lpss-platform.c + create mode 100644 drivers/pwm/pwm-lpss.h +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 766191df2010] 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 +Merge made by the 'recursive' strategy. + tools/testing/ktest/ktest.pl | 61 +++++++++++++++++++++++++++++++---------- + tools/testing/ktest/sample.conf | 10 +++++++ + 2 files changed, 57 insertions(+), 14 deletions(-) +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 +Auto-merging include/linux/clk.h +Auto-merging arch/arm/mach-omap2/prm_common.c +Auto-merging arch/arm/mach-omap2/io.c +Auto-merging arch/arm/boot/dts/sun7i-a20.dtsi +Auto-merging arch/arm/boot/dts/sun5i-a13.dtsi +Auto-merging arch/arm/boot/dts/sun5i-a10s.dtsi +Auto-merging arch/arm/boot/dts/exynos3250.dtsi +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/exynos3250-clock.txt | 10 +- + .../devicetree/bindings/clock/gpio-gate-clock.txt | 21 ++ + .../devicetree/bindings/clock/pxa-clock.txt | 16 + + Documentation/devicetree/bindings/clock/sunxi.txt | 4 + + Documentation/kernel-parameters.txt | 14 +- + arch/arm/boot/dts/exynos3250.dtsi | 6 + + arch/arm/boot/dts/pxa27x.dtsi | 20 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 2 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- + arch/arm/mach-omap2/io.c | 12 +- + arch/arm/mach-omap2/prm_common.c | 2 - + arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | 10 + + drivers/clk/Kconfig | 5 + + drivers/clk/Makefile | 2 + + drivers/clk/clk-axi-clkgen.c | 1 - + drivers/clk/clk-gate.c | 2 +- + drivers/clk/clk-gpio-gate.c | 205 ++++++++++++ + drivers/clk/clk-max77686.c | 1 - + drivers/clk/clk-max77802.c | 1 - + drivers/clk/clk-palmas.c | 1 - + drivers/clk/clk-twl6040.c | 1 - + drivers/clk/clk-wm831x.c | 1 - + drivers/clk/clk.c | 95 +++++- + drivers/clk/hisilicon/clk-hix5hd2.c | 232 ++++++++++++- + drivers/clk/pxa/Makefile | 2 + + drivers/clk/pxa/clk-pxa.c | 97 ++++++ + drivers/clk/pxa/clk-pxa.h | 107 ++++++ + drivers/clk/pxa/clk-pxa27x.c | 370 +++++++++++++++++++++ + drivers/clk/qcom/clk-pll.c | 68 +++- + drivers/clk/qcom/clk-pll.h | 20 ++ + drivers/clk/qcom/clk-rcg.c | 115 +++---- + drivers/clk/qcom/clk-rcg.h | 6 +- + drivers/clk/qcom/clk-rcg2.c | 19 +- + drivers/clk/qcom/common.c | 16 + + drivers/clk/qcom/common.h | 4 + + drivers/clk/qcom/gcc-ipq806x.c | 31 +- + drivers/clk/qcom/mmcc-apq8084.c | 1 - + drivers/clk/qcom/mmcc-msm8960.c | 29 +- + drivers/clk/qcom/mmcc-msm8974.c | 1 - + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-cpu.c | 329 ++++++++++++++++++ + drivers/clk/rockchip/clk-pll.c | 63 +--- + drivers/clk/rockchip/clk-rk3188.c | 163 ++++++++- + drivers/clk/rockchip/clk-rk3288.c | 195 ++++++++--- + drivers/clk/rockchip/clk.c | 46 +++ + drivers/clk/rockchip/clk.h | 38 +++ + drivers/clk/samsung/clk-exynos3250.c | 202 ++++++++++- + drivers/clk/samsung/clk-exynos4.c | 18 +- + drivers/clk/samsung/clk-exynos5260.c | 2 +- + drivers/clk/samsung/clk-s3c2410-dclk.c | 1 - + drivers/clk/samsung/clk-s3c2412.c | 29 ++ + drivers/clk/samsung/clk-s3c2443.c | 19 ++ + drivers/clk/sunxi/Makefile | 2 + + drivers/clk/sunxi/clk-factors.c | 101 +++++- + drivers/clk/sunxi/clk-factors.h | 16 +- + drivers/clk/sunxi/clk-mod0.c | 283 ++++++++++++++++ + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 1 - + drivers/clk/sunxi/clk-sun6i-apb0.c | 1 - + drivers/clk/sunxi/clk-sun6i-ar100.c | 1 - + drivers/clk/sunxi/clk-sun8i-apb0.c | 1 - + drivers/clk/sunxi/clk-sun8i-mbus.c | 78 +++++ + drivers/clk/sunxi/clk-sunxi.c | 152 +-------- + drivers/clk/tegra/clk-tegra124.c | 8 + + drivers/clk/tegra/clk.c | 9 +- + drivers/clk/ti/clk-dra7-atl.c | 3 +- + drivers/clk/ti/clk.c | 68 ++-- + drivers/clk/ti/clockdomain.c | 5 + + drivers/clk/ti/divider.c | 4 +- + include/asm-generic/clkdev.h | 2 + + include/dt-bindings/clock/exynos3250.h | 27 ++ + include/dt-bindings/clock/exynos4.h | 12 +- + include/dt-bindings/clock/hix5hd2-clock.h | 27 ++ + include/dt-bindings/clock/pxa-clock.h | 77 +++++ + include/dt-bindings/clock/rk3188-cru-common.h | 1 + + include/dt-bindings/clock/rk3288-cru.h | 82 ++++- + include/dt-bindings/clock/tegra124-car.h | 6 +- + include/linux/clk-private.h | 1 + + include/linux/clk-provider.h | 33 ++ + include/linux/clk.h | 29 ++ + include/linux/clk/ti.h | 1 + + 81 files changed, 3239 insertions(+), 452 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/gpio-gate-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/pxa-clock.txt + create mode 100644 drivers/clk/clk-gpio-gate.c + create mode 100644 drivers/clk/pxa/Makefile + create mode 100644 drivers/clk/pxa/clk-pxa.c + create mode 100644 drivers/clk/pxa/clk-pxa.h + create mode 100644 drivers/clk/pxa/clk-pxa27x.c + create mode 100644 drivers/clk/rockchip/clk-cpu.c + create mode 100644 drivers/clk/sunxi/clk-mod0.c + create mode 100644 drivers/clk/sunxi/clk-sun8i-mbus.c + create mode 100644 include/dt-bindings/clock/pxa-clock.h +Merging random/dev (13aa93c70e71 random: add and use memzero_explicit() for clearing data) +$ git merge random/dev +Auto-merging lib/string.c +Auto-merging drivers/char/random.c +Merge made by the 'recursive' strategy. + drivers/char/random.c | 8 ++++---- + include/linux/string.h | 5 +++-- + lib/string.c | 16 ++++++++++++++++ + 3 files changed, 23 insertions(+), 6 deletions(-) +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 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 (64260a5bd412 arm: LLVMLinux: Use global stack register variable for percpu) +$ git merge llvmlinux/for-next +Auto-merging security/integrity/ima/ima_crypto.c +Auto-merging fs/btrfs/hash.c +Auto-merging drivers/md/dm-crypt.c +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 +- + crypto/hmac.c | 25 ++++++++--------- + crypto/testmgr.c | 14 ++++------ + drivers/crypto/ccp/ccp-crypto-sha.c | 13 ++++----- + drivers/crypto/mv_cesa.c | 41 ++++++++++++---------------- + drivers/crypto/n2_core.c | 11 +++----- + drivers/crypto/omap-sham.c | 28 ++++++++----------- + drivers/crypto/qat/qat_common/qat_algs.c | 31 ++++++++++----------- + drivers/md/dm-crypt.c | 34 ++++++++++------------- + fs/btrfs/hash.c | 16 +++++------ + include/crypto/hash.h | 5 ++++ + lib/libcrc32c.c | 16 +++++------ + security/integrity/ima/ima_crypto.c | 47 +++++++++++++------------------- + 18 files changed, 136 insertions(+), 173 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 signal-cleanup/signal_v4 (b9f0fb2d4a7a powerpc: Use sigsp()) +$ git merge signal-cleanup/signal_v4 +Resolved 'arch/s390/kernel/compat_signal.c' using previous resolution. +Resolved 'arch/s390/kernel/signal.c' using previous resolution. +Resolved 'arch/unicore32/kernel/signal.c' using previous resolution. +Auto-merging arch/unicore32/kernel/signal.c +CONFLICT (content): Merge conflict in arch/unicore32/kernel/signal.c +Auto-merging arch/s390/kernel/signal.c +CONFLICT (content): Merge conflict in arch/s390/kernel/signal.c +Auto-merging arch/s390/kernel/compat_signal.c +CONFLICT (content): Merge conflict in arch/s390/kernel/compat_signal.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master de30cd9eeb5e] Merge remote-tracking branch 'signal-cleanup/signal_v4' +$ git diff -M --stat --summary HEAD^.. +Merging akpm-current/current (833628771769 scripts/sortextable: suppress warning: `relocs_size' may be used uninitialized) +$ git merge --no-ff akpm-current/current +Resolved 'drivers/clk/Kconfig' using previous resolution. +Resolved 'mm/page_alloc.c' using previous resolution. +Auto-merging scripts/headers_install.sh +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +Auto-merging mm/page_alloc.c +CONFLICT (content): Merge conflict in mm/page_alloc.c +Auto-merging mm/page-writeback.c +Auto-merging mm/mremap.c +Auto-merging mm/mmap.c +Auto-merging mm/mlock.c +Auto-merging mm/migrate.c +Auto-merging mm/memcontrol.c +Auto-merging mm/huge_memory.c +Auto-merging mm/gup.c +Auto-merging mm/filemap.c +Auto-merging mm/backing-dev.c +Auto-merging mm/Makefile +Auto-merging lib/vsprintf.c +Removing lib/prio_heap.c +Auto-merging lib/dynamic_debug.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/watchdog.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/sys.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/resource.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/fork.c +Auto-merging kernel/debug/debug_core.c +Auto-merging ipc/util.c +Auto-merging init/Kconfig +Auto-merging include/linux/string.h +Auto-merging include/linux/sched.h +Removing include/linux/prio_heap.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/blkdev.h +Auto-merging include/asm-generic/pgtable.h +Auto-merging include/asm-generic/dma-mapping-common.h +Auto-merging fs/proc/base.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/dlm/dlmmaster.c +Auto-merging fs/ncpfs/dir.c +Auto-merging fs/internal.h +Auto-merging fs/cifs/smb2pdu.h +Auto-merging fs/cifs/smb2pdu.c +Auto-merging fs/cifs/smb2ops.c +Auto-merging fs/cifs/smb2misc.c +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/cifssmb.c +Auto-merging fs/cifs/cifsacl.c +Auto-merging fs/buffer.c +Auto-merging fs/block_dev.c +Auto-merging fs/autofs4/expire.c +Auto-merging drivers/tty/vt/keyboard.c +Auto-merging drivers/rtc/Makefile +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/misc/ti-st/st_core.c +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/input/input.c +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +CONFLICT (content): Merge conflict in drivers/clk/Kconfig +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging drivers/base/node.c +Auto-merging block/genhd.c +Auto-merging block/bio-integrity.c +Auto-merging arch/x86/include/asm/pgtable_types.h +Auto-merging arch/x86/Kconfig +Removing arch/score/include/asm/sections.h +Auto-merging arch/score/include/asm/Kbuild +Auto-merging arch/powerpc/include/asm/pgtable.h +Removing arch/mn10300/include/asm/sections.h +Auto-merging arch/mn10300/include/asm/Kbuild +Removing arch/mips/include/asm/suspend.h +Removing arch/m32r/include/asm/sections.h +Auto-merging arch/m32r/include/asm/Kbuild +Removing arch/cris/include/asm/sections.h +Auto-merging arch/cris/include/asm/Kbuild +Auto-merging arch/arm64/mm/dma-mapping.c +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/boot/dts/exynos3250.dtsi +Auto-merging arch/arm/Kconfig +Removing arch/alpha/include/asm/sections.h +Auto-merging arch/alpha/include/asm/Kbuild +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0adf018389dd] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-devices-node | 8 - + Documentation/ABI/testing/sysfs-block-zram | 32 +- + Documentation/ABI/testing/sysfs-devices-memory | 8 + + Documentation/binfmt_misc.txt | 50 +- + Documentation/blockdev/zram.txt | 25 +- + Documentation/devicetree/bindings/i2c/ti,bq32k.txt | 18 + + .../devicetree/bindings/i2c/trivial-devices.txt | 1 - + .../devicetree/bindings/rtc/dallas,ds1339.txt | 18 + + Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 3 + + Documentation/filesystems/autofs4.txt | 520 ++++++++++ + Documentation/kernel-parameters.txt | 14 +- + Documentation/leds/leds-class.txt | 3 - + Documentation/memory-hotplug.txt | 11 +- + Documentation/printk-formats.txt | 6 + + Documentation/sysctl/kernel.txt | 2 + + MAINTAINERS | 32 +- + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/include/asm/sections.h | 7 - + arch/arm/Kconfig | 6 + + arch/arm/boot/dts/exynos3250.dtsi | 2 +- + arch/arm/include/asm/pgtable-2level.h | 2 + + arch/arm/include/asm/pgtable-3level.h | 15 + + arch/arm/include/asm/pgtable.h | 6 +- + arch/arm/include/asm/tlb.h | 38 +- + arch/arm/kernel/hibernate.c | 3 +- + arch/arm/mm/dma-mapping.c | 210 ++-- + arch/arm/mm/flush.c | 15 + + arch/arm/mm/init.c | 2 +- + arch/arm64/Kconfig | 5 + + arch/arm64/include/asm/pgtable.h | 21 +- + arch/arm64/include/asm/tlb.h | 20 +- + arch/arm64/mm/dma-mapping.c | 164 ++- + arch/arm64/mm/flush.c | 16 + + arch/cris/include/asm/Kbuild | 1 + + arch/cris/include/asm/sections.h | 7 - + arch/frv/include/asm/processor.h | 16 - + arch/frv/kernel/irq-mb93091.c | 8 +- + arch/frv/kernel/irq-mb93093.c | 1 - + arch/frv/kernel/irq-mb93493.c | 4 +- + arch/frv/kernel/setup.c | 2 - + arch/frv/kernel/time.c | 1 - + arch/m32r/include/asm/Kbuild | 1 + + arch/m32r/include/asm/sections.h | 7 - + arch/m32r/kernel/time.c | 1 - + arch/m68k/kernel/sys_m68k.c | 21 +- + arch/mips/include/asm/suspend.h | 7 - + arch/mips/power/cpu.c | 2 +- + arch/mn10300/include/asm/Kbuild | 1 + + arch/mn10300/include/asm/sections.h | 1 - + arch/powerpc/include/asm/pgtable.h | 57 +- + arch/powerpc/include/asm/pte-common.h | 5 + + arch/powerpc/kernel/suspend.c | 4 +- + arch/s390/kernel/suspend.c | 6 +- + arch/score/include/asm/Kbuild | 1 + + arch/score/include/asm/sections.h | 6 - + arch/sh/include/asm/sections.h | 1 - + arch/sparc/power/hibernate.c | 4 +- + arch/unicore32/include/mach/pm.h | 3 - + arch/unicore32/kernel/hibernate.c | 1 + + arch/x86/Kconfig | 1 - + arch/x86/include/asm/pgtable_types.h | 14 + + arch/x86/kernel/crash.c | 10 +- + arch/x86/kernel/kexec-bzimage64.c | 15 +- + arch/x86/mm/ioremap.c | 20 +- + arch/x86/platform/efi/efi-bgrt.c | 36 +- + arch/x86/power/hibernate_32.c | 4 +- + arch/x86/power/hibernate_64.c | 4 +- + arch/x86/purgatory/Makefile | 3 +- + block/bio-integrity.c | 2 - + block/genhd.c | 2 +- + drivers/base/dma-coherent.c | 151 ++- + drivers/base/dma-contiguous.c | 72 ++ + drivers/base/dma-mapping.c | 72 ++ + drivers/base/memory.c | 42 + + drivers/base/node.c | 3 - + drivers/block/zram/zram_drv.c | 106 +- + drivers/block/zram/zram_drv.h | 6 + + drivers/clk/Kconfig | 9 + + drivers/clk/Makefile | 1 + + drivers/clk/clk-rk808.c | 170 ++++ + drivers/firmware/memmap.c | 3 + + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 3 + + drivers/input/input.c | 6 + + drivers/input/leds.c | 276 ++++++ + drivers/leds/Kconfig | 3 - + drivers/memstick/host/r592.c | 2 + + drivers/misc/ti-st/st_core.c | 2 +- + drivers/rtc/Kconfig | 33 +- + drivers/rtc/Makefile | 2 + + drivers/rtc/rtc-bq32k.c | 62 ++ + drivers/rtc/rtc-ds1307.c | 67 +- + drivers/rtc/rtc-isl12022.c | 2 +- + drivers/rtc/rtc-max77686.c | 140 +-- + drivers/rtc/rtc-max77802.c | 502 ++++++++++ + drivers/rtc/rtc-mpc5121.c | 2 +- + drivers/rtc/rtc-pcf8563.c | 4 +- + drivers/rtc/rtc-pcf8583.c | 18 +- + drivers/rtc/rtc-pm8xxx.c | 217 ++-- + drivers/rtc/rtc-rk808.c | 414 ++++++++ + drivers/rtc/rtc-rs5c372.c | 11 +- + drivers/rtc/rtc-s3c.c | 851 ++++++++++------ + drivers/tty/Kconfig | 4 + + drivers/tty/vt/keyboard.c | 110 ++- + drivers/video/backlight/backlight.c | 2 - + drivers/virtio/Kconfig | 1 + + drivers/virtio/virtio_balloon.c | 76 +- + fs/affs/amigaffs.c | 2 - + fs/affs/file.c | 39 +- + fs/affs/inode.c | 3 - + fs/affs/super.c | 6 +- + fs/autofs4/autofs_i.h | 6 +- + fs/autofs4/dev-ioctl.c | 2 +- + fs/autofs4/expire.c | 210 ++-- + fs/autofs4/root.c | 62 +- + fs/befs/btree.c | 53 +- + fs/binfmt_misc.c | 23 +- + fs/block_dev.c | 7 + + fs/buffer.c | 26 +- + 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/coredump.c | 8 + + fs/ext4/fsync.c | 5 +- + fs/fat/misc.c | 2 - + fs/hfs/hfs_fs.h | 2 - + fs/hfsplus/catalog.c | 89 +- + fs/hfsplus/dir.c | 11 +- + fs/hfsplus/hfsplus_fs.h | 4 +- + fs/hfsplus/super.c | 4 +- + fs/internal.h | 5 + + fs/mpage.c | 25 +- + fs/ncpfs/dir.c | 3 - + fs/nilfs2/file.c | 8 +- + fs/nilfs2/inode.c | 13 +- + fs/nilfs2/ioctl.c | 8 +- + fs/nilfs2/nilfs.h | 14 +- + fs/nilfs2/segment.c | 7 +- + fs/nilfs2/super.c | 6 + + fs/nilfs2/the_nilfs.h | 22 + + fs/notify/fsnotify.h | 3 - + fs/notify/group.c | 2 +- + fs/notify/inotify/inotify_fsnotify.c | 6 +- + fs/ntfs/file.c | 5 +- + fs/ntfs/super.c | 2 +- + fs/ocfs2/alloc.c | 28 +- + fs/ocfs2/alloc.h | 2 +- + fs/ocfs2/aops.c | 212 +++- + fs/ocfs2/cluster/heartbeat.c | 19 + + fs/ocfs2/cluster/heartbeat.h | 1 + + fs/ocfs2/cluster/netdebug.c | 78 +- + fs/ocfs2/cluster/tcp.c | 43 +- + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/dlm/dlmast.c | 6 +- + fs/ocfs2/dlm/dlmdebug.c | 39 +- + fs/ocfs2/dlm/dlmdomain.c | 44 +- + fs/ocfs2/dlm/dlmmaster.c | 25 +- + fs/ocfs2/dlm/dlmrecovery.c | 7 +- + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/ocfs2/dlmglue.c | 23 +- + fs/ocfs2/file.c | 153 ++- + fs/ocfs2/file.h | 9 + + fs/ocfs2/inode.c | 10 +- + fs/ocfs2/inode.h | 2 +- + fs/ocfs2/journal.c | 91 +- + fs/ocfs2/journal.h | 5 + + fs/ocfs2/move_extents.c | 2 +- + fs/ocfs2/namei.c | 161 ++- + fs/ocfs2/namei.h | 21 +- + fs/ocfs2/ocfs2.h | 6 + + fs/ocfs2/stack_user.c | 2 +- + fs/omfs/inode.c | 10 +- + fs/omfs/omfs_fs.h | 1 + + fs/proc/base.c | 36 +- + fs/proc/internal.h | 5 +- + fs/proc/kcore.c | 4 +- + fs/proc/page.c | 3 + + fs/proc/task_mmu.c | 332 ++++--- + fs/proc/task_nommu.c | 88 +- + fs/reiserfs/journal.c | 8 +- + fs/ufs/balloc.c | 3 - + include/asm-generic/dma-mapping-common.h | 9 + + include/asm-generic/pgtable.h | 27 +- + include/asm-generic/sections.h | 4 + + include/linux/balloon_compaction.h | 169 +--- + include/linux/blkdev.h | 2 +- + include/linux/cma.h | 3 + + include/linux/compaction.h | 24 +- + include/linux/compiler-gcc5.h | 66 ++ + include/linux/crc64_ecma.h | 56 ++ + include/linux/genalloc.h | 7 + + include/linux/gfp.h | 2 +- + include/linux/huge_mm.h | 2 +- + include/linux/input.h | 21 + + include/linux/kernel.h | 56 +- + include/linux/kexec.h | 1 + + include/linux/list.h | 1 + + include/linux/memcontrol.h | 15 - + include/linux/memory_hotplug.h | 1 + + include/linux/mempolicy.h | 7 +- + include/linux/migrate.h | 14 +- + include/linux/mm.h | 39 +- + include/linux/mmdebug.h | 20 + + include/linux/mmzone.h | 51 +- + include/linux/pagemap.h | 18 +- + include/linux/prio_heap.h | 58 -- + include/linux/rbtree_augmented.h | 10 + + include/linux/rmap.h | 2 +- + include/linux/sched.h | 6 +- + include/linux/screen_info.h | 8 - + include/linux/signal.h | 29 +- + include/linux/slab.h | 64 +- + include/linux/slab_def.h | 20 +- + include/linux/string.h | 1 + + include/linux/swap.h | 22 +- + include/linux/topology.h | 17 + + include/linux/vm_event_item.h | 7 + + include/linux/zsmalloc.h | 2 +- + include/uapi/linux/kernel-page-flags.h | 1 + + include/uapi/linux/prctl.h | 27 + + init/Kconfig | 12 +- + init/initramfs.c | 34 +- + ipc/compat.c | 92 +- + ipc/ipc_sysctl.c | 3 +- + ipc/shm.c | 7 - + ipc/util.c | 20 +- + kernel/acct.c | 14 +- + kernel/async.c | 8 +- + kernel/debug/debug_core.c | 9 +- + kernel/debug/kdb/kdb_debugger.c | 4 + + kernel/debug/kdb/kdb_main.c | 4 +- + kernel/fork.c | 3 +- + kernel/kallsyms.c | 11 +- + kernel/kexec.c | 32 +- + kernel/kthread.c | 2 +- + kernel/printk/printk.c | 14 +- + kernel/resource.c | 36 + + kernel/sched/fair.c | 2 +- + kernel/sys.c | 489 ++++++--- + kernel/sysctl.c | 7 - + kernel/time/posix-timers.c | 57 +- + kernel/watchdog.c | 18 +- + lib/Kconfig | 7 + + lib/Kconfig.debug | 2 +- + lib/Makefile | 5 +- + lib/crc64_ecma.c | 341 +++++++ + lib/dynamic_debug.c | 17 +- + lib/genalloc.c | 49 + + lib/prio_heap.c | 70 -- + lib/textsearch.c | 4 +- + lib/vsprintf.c | 20 +- + mm/Kconfig | 10 +- + mm/Makefile | 5 +- + mm/backing-dev.c | 2 +- + mm/balloon_compaction.c | 123 +-- + mm/bootmem.c | 4 +- + mm/cma.c | 83 +- + mm/compaction.c | 674 ++++++++----- + mm/debug.c | 237 +++++ + mm/dmapool.c | 58 +- + mm/filemap.c | 4 +- + mm/gup.c | 354 +++++++ + mm/huge_memory.c | 28 +- + mm/hugetlb.c | 14 +- + mm/internal.h | 26 +- + mm/interval_tree.c | 2 +- + mm/kmemcheck.c | 1 + + mm/ksm.c | 4 +- + mm/memcontrol.c | 282 ++---- + mm/memory.c | 8 + + mm/memory_hotplug.c | 2 +- + mm/mempolicy.c | 134 ++- + mm/migrate.c | 16 +- + mm/mlock.c | 6 +- + mm/mmap.c | 74 +- + mm/mremap.c | 5 +- + mm/oom_kill.c | 6 +- + mm/page-writeback.c | 8 +- + mm/page_alloc.c | 348 +++---- + mm/pagewalk.c | 2 +- + mm/rmap.c | 8 +- + mm/shmem.c | 2 + + mm/slab.c | 349 +++---- + mm/slab.h | 57 +- + mm/slab_common.c | 178 +++- + mm/slob.c | 2 - + mm/slub.c | 126 +-- + mm/swap.c | 31 +- + mm/swap_state.c | 16 +- + mm/util.c | 53 +- + mm/vmalloc.c | 20 +- + mm/vmscan.c | 112 +-- + mm/vmstat.c | 153 ++- + mm/zbud.c | 13 +- + mm/zsmalloc.c | 46 +- + scripts/checkpatch.pl | 107 +- + scripts/headers_install.sh | 4 +- + scripts/sortextable.h | 2 +- + scripts/spelling.txt | 1042 ++++++++++++++++++++ + tools/testing/selftests/vm/Makefile | 1 + + tools/testing/selftests/vm/transhuge-stress.c | 144 +++ + tools/vm/page-types.c | 1 + + 308 files changed, 10275 insertions(+), 4298 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/ti,bq32k.txt + create mode 100644 Documentation/devicetree/bindings/rtc/dallas,ds1339.txt + create mode 100644 Documentation/filesystems/autofs4.txt + delete mode 100644 arch/alpha/include/asm/sections.h + delete mode 100644 arch/cris/include/asm/sections.h + delete mode 100644 arch/m32r/include/asm/sections.h + delete mode 100644 arch/mips/include/asm/suspend.h + delete mode 100644 arch/mn10300/include/asm/sections.h + delete mode 100644 arch/score/include/asm/sections.h + create mode 100644 drivers/clk/clk-rk808.c + create mode 100644 drivers/input/leds.c + create mode 100644 drivers/rtc/rtc-max77802.c + create mode 100644 drivers/rtc/rtc-rk808.c + create mode 100644 include/linux/compiler-gcc5.h + create mode 100644 include/linux/crc64_ecma.h + delete mode 100644 include/linux/prio_heap.h + create mode 100644 lib/crc64_ecma.c + delete mode 100644 lib/prio_heap.c + create mode 100644 mm/debug.c + create mode 100644 scripts/spelling.txt + create mode 100644 tools/testing/selftests/vm/transhuge-stress.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/gpio/gpio-zevio.c: fix build +Applying: arch/x86/kernel/cpu/common.c: fix unused symbol warning +Applying: lib/string.c: remove duplicated function +Applying: lib: string: Make all calls to strnicmp into calls to strncasecmp +Applying: ARM: replace strnicmp with strncasecmp +Applying: netfilter: replace strnicmp with strncasecmp +Applying: video: fbdev: replace strnicmp with strncasecmp +Applying: cifs: replace strnicmp with strncasecmp +Applying: ocfs2: replace strnicmp with strncasecmp +Applying: isofs: replace strnicmp with strncasecmp +Applying: batman-adv: replace strnicmp with strncasecmp +Applying: scsi: replace strnicmp with strncasecmp +Applying: ib_srpt: replace strnicmp with strncasecmp +Applying: input: edt-ft5x06: replace strnicmp with strncasecmp +Applying: altera-stapl: replace strnicmp with strncasecmp +Applying: thinkpad_acpi: replace strnicmp with strncasecmp +Applying: PNP: replace strnicmp with strncasecmp +Applying: s390/cio: replace strnicmp with strncasecmp +Applying: staging: r8188eu: replace strnicmp with strncasecmp +Applying: thermal: replace strnicmp with strncasecmp +Applying: kdb: replace strnicmp with strncasecmp +Applying: fs: check bh blocknr earlier when searching lru +Applying: arch/x86/mm/numa.c: fix boot failure when all nodes are hotpluggable +Applying: mem-hotplug-fix-boot-failed-in-case-all-the-nodes-are-hotpluggable-checkpatch-fixes +Applying: include/linux: remove strict_strto* definitions +Applying: lib / string_helpers: move documentation to c-file +Applying: lib / string_helpers: refactoring the test suite +Applying: lib / string_helpers: introduce string_escape_mem() +Applying: lib-string_helpers-introduce-string_escape_mem-fix +Applying: lib/vsprintf: add %*pE[achnops] format specifier +Applying: lib-vsprintf-add-%pe-format-specifier-fix +Applying: wireless: libertas: print esaped string via %*pE +Applying: wireless: ipw2x00: print SSID via %*pE +Applying: wireless: hostap: proc: print properly escaped SSID +Applying: wireless-hostap-proc-print-properly-escaped-ssid-fix +Applying: wireless-hostap-proc-print-properly-escaped-ssid-fix-2 +Applying: lib80211: remove unused print_ssid() +Applying: staging: wlan-ng: use %*pEhp to print SN +Applying: staging: rtl8192e: use %*pEn to escape buffer +Applying: staging: rtl8192u: use %*pEn to escape buffer +Applying: kernel/watchdog.c: control hard lockup detection default +Applying: watchdog-control-hard-lockup-detection-default-fix +Applying: watchdog, nmi: Fix compile issues on sparc +Applying: kvm: ensure hard lockup detection is disabled by default +Applying: frv: remove unused declarations of __start___ex_table and __stop___ex_table +Applying: ia64: remove duplicate declarations of __per_cpu_start[] and __per_cpu_end[] +Applying: kernel/param: consolidate __{start,stop}___param[] in <linux/moduleparam.h> +Applying: mm: softdirty: enable write notifications on VMAs after VM_SOFTDIRTY cleared +Applying: mm-softdirty-enable-write-notifications-on-vmas-after-vm_softdirty-cleared-fix +Applying: fat: add i_disksize to represent uninitialized size +Applying: fat: add fat_fallocate operation +Applying: fat: skip cluster allocation on fallocated region +Applying: fat: permit to return phy block number by fibmap in fallocated region +Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate +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 + + 9784a199b067...1a99c82c858f akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (1a99c82c858f 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/filesystems/vfat.txt | 10 + + Documentation/printk-formats.txt | 32 +++ + Documentation/vm/remap_file_pages.txt | 7 +- + arch/arm/mach-pxa/lpd270.c | 12 +- + arch/frv/mm/extable.c | 2 - + arch/ia64/include/asm/sections.h | 2 +- + arch/x86/kernel/cpu/common.c | 4 +- + arch/x86/kernel/kvm.c | 8 + + arch/x86/mm/numa.c | 89 +++---- + drivers/gpio/gpio-zevio.c | 4 + + drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- + drivers/input/touchscreen/edt-ft5x06.c | 2 +- + drivers/misc/altera-stapl/altera.c | 4 +- + drivers/net/wireless/hostap/hostap_proc.c | 5 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 22 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 270 +++++++-------------- + drivers/net/wireless/ipw2x00/libipw_rx.c | 65 +++--- + drivers/net/wireless/ipw2x00/libipw_wx.c | 16 +- + drivers/net/wireless/libertas/cfg.c | 8 +- + drivers/net/wireless/libertas/mesh.c | 7 +- + drivers/platform/x86/thinkpad_acpi.c | 4 +- + drivers/pnp/interface.c | 24 +- + drivers/s390/cio/chp.c | 4 +- + drivers/scsi/ips.c | 2 +- + drivers/scsi/scsi_debug.c | 2 +- + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 2 +- + drivers/staging/rtl8192e/rtllib.h | 14 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 14 +- + drivers/staging/wlan-ng/prism2sta.c | 28 +-- + drivers/thermal/thermal_core.c | 8 +- + drivers/video/fbdev/pvr2fb.c | 2 +- + drivers/video/fbdev/s3c2410fb.c | 8 +- + drivers/video/fbdev/sis/sis_main.c | 66 +++--- + drivers/video/fbdev/sm501fb.c | 4 +- + drivers/w1/w1_int.c | 3 +- + fs/buffer.c | 4 +- + fs/cifs/cifs_dfs_ref.c | 6 +- + fs/cifs/connect.c | 4 +- + fs/fat/cache.c | 40 ++-- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 82 ++++++- + fs/fat/inode.c | 79 ++++++- + fs/isofs/inode.c | 2 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/ocfs2/cluster/masklog.c | 6 +- + fs/proc/task_mmu.c | 19 +- + include/asm-generic/pgtable.h | 14 ++ + include/linux/fs.h | 8 +- + include/linux/kernel.h | 4 - + include/linux/mm.h | 5 + + include/linux/moduleparam.h | 2 + + include/linux/nmi.h | 13 ++ + include/linux/string.h | 2 +- + include/linux/string_helpers.h | 65 +++--- + include/net/lib80211.h | 5 - + init/main.c | 2 - + kernel/debug/kdb/kdb_bp.c | 6 +- + kernel/params.c | 7 +- + kernel/watchdog.c | 50 +++- + lib/string.c | 28 +-- + lib/string_helpers.c | 312 +++++++++++++++++++++++++ + lib/test-string_helpers.c | 277 ++++++++++++++++++++-- + lib/vsprintf.c | 71 ++++++ + mm/Makefile | 2 +- + mm/backing-dev.c | 35 +++ + mm/fremap.c | 283 ---------------------- + mm/memory.c | 3 +- + mm/mmap.c | 114 +++++++-- + mm/mprotect.c | 20 +- + mm/nommu.c | 8 - + net/batman-adv/gateway_common.c | 8 +- + net/netfilter/ipvs/ip_vs_ftp.c | 6 +- + net/netfilter/nf_conntrack_ftp.c | 4 +- + net/netfilter/nf_conntrack_sip.c | 22 +- + net/netfilter/nf_log.c | 2 +- + net/netfilter/nf_nat_sip.c | 2 +- + net/wireless/lib80211.c | 32 --- + 78 files changed, 1482 insertions(+), 944 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..fd633a15b807 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..81fac16a5838 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20141010 |