diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-21 21:25:04 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-21 21:25:04 +1100 |
| commit | f9f7b9d7aeedb0f6150bc9df08542c3a0b67a4ef (patch) | |
| tree | a59a47c93af6b7f57576d788cef80a1851547ac3 | |
| parent | e77b7931b09389018efd0b8fb61ca02a6b74afda (diff) | |
Add linux-next specific files for 20141221next-20141221
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 233 | ||||
| -rw-r--r-- | Next/Trees | 235 | ||||
| -rw-r--r-- | Next/merge.log | 2132 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2603 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..9fdc8eda056e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,233 @@ +Name SHA1 +---- ---- +origin 97bf6af1f928216fd6c5a66e8a57bfa95a659672 +fixes b94d525e58dc9638dd3f98094cb468bcfb262039 +kbuild-current f114040e3ea6e07372334ade75d1ee0775c355e1 +arc-current 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd +arm-current 3f4aa45ceea5789a4aade536acc27f2e0d3da5e1 +m68k-current f0b99a643e9613beb28af43333bbfa90d4bf85cc +metag-fixes ffe6902b66aaa4ca6694bc19639259c16d84ddb1 +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-merge 31345e1a071e4e5f2fa8b6be5ca7d1cbce20cfca +powerpc-merge-mpe b2776bf7149bddd1f4161f14f79520f17fc1d71d +sparc 66d0f7ec9f1038452178b1993fc07fd96d30fd38 +net 02d6a746c3f0cdd6f8aad0afd0b32d4646d6525e +ipsec f855691975bb06373a98711e4cfe2c224244b536 +sound-current d70a1b9893f820fdbcdffac408c909c50f2e6b43 +pci-current 5106787a9e08dc2901d6b2513ed8f377671befa8 +wireless 9a1dce3a059111a7289680f4b8c0ec4f8736b6ee +driver-core.current 2dbfca5a181973558277b28b1f4c36362291f5e0 +tty.current 2dbfca5a181973558277b28b1f4c36362291f5e0 +usb.current 2dbfca5a181973558277b28b1f4c36362291f5e0 +usb-gadget-fixes 520fe7633692181bb6d1560d655fbdfbb7c05aaa +usb-serial-fixes 009d0431c3914de64666bec0d350e54fdd59df6a +staging.current 2dbfca5a181973558277b28b1f4c36362291f5e0 +char-misc.current 67e2c3883828b39548cee2091b36656787775d95 +input-current 6d32af019a45654b6eb3ae2ff17d51ba1f045bb4 +md-current d47648fcf0611812286f68131b40251c6fa54f5e +crypto-current 8606813a6c8997fd3bb805186056d78670eb86ca +ide f96fe225677b3efb74346ebd56fafe3997b02afa +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +devicetree-current 094cb98179f19b75acf9ff471daabf3948ce98e6 +rr-fixes 3438cf549d2f3ee8e52c82acc8e2a9710ac21a5b +vfio-fixes 239a87020b263fe7e70adc5803cb157955023d3c +kselftest-fixes 3ce51050fadd63737c03627293ca2dc4be238891 +drm-intel-fixes b0616c5306b342ceca07044dbc4f917d95c4f825 +asm-generic cb61f6769b8836081940ba26249f1b756400c7df +arc 7a70bf797a587205991b8e3153d764561de867de +arm e9f2d6d66037cdf97487491e04053f411abc5d16 +arm-perf cac7f2429872d3733dc3f9915857b1691da2eb2f +arm-soc d6ad36913083d683aad4e02e53580c995f1a6ede +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +berlin 91bcb334bf0bd099af925d73447b91f58eb5250c +cortex-m f0d7515372ff0ea53fd66099533d3c8e0464cbbf +ep93xx bfb0709fd17b13498d99592bbe12c91130e35a55 +imx-mxs 8a73e870fc56150d19eb33fd225ae4660469385a +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +keystone b17275a4a6cc61e0b7da40558ff5c7250fb80917 +msm 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1 +mvebu 9993917cbc99e056f7135e4b8f7ffb76be0bc8fc +renesas f180b3e0dbd9ec4345d0e9b6f007a0d87922a517 +samsung 9db7d78aca2c7fbc19a26ce2ef01c805dc010c72 +sunxi ad01dbad562646056ebfc5e06c2bb18a2e44c63d +tegra fa047e01365d4fe309ec56ff6521edd10ca5d0c5 +arm64 fb59d007a0e44e2304e4fc8cf5c20b6fda7890f3 +blackfin 275f5a8573e7832d0cf344a1b29da357c7038870 +c6x ae72758f1dd93bd367dc7719702f24a9bfb3bad9 +cris 21bd887cd7c485214bbdbf6a52ce9a74ac85c844 +hexagon 8914d7e857807e1e60975000cba3750c9b2643e8 +ia64 0fd2468fd035039c7493d28b60664ab7276f5005 +m68k f0b99a643e9613beb28af43333bbfa90d4bf85cc +m68knommu 0259650b4cf7a5e44c43ffb9df58d0c4c36defa7 +metag f93125ae17d1d259b5aba84016db260903822194 +microblaze 3a8e3265179b7e6394d7aab4d6df5651b49e7243 +mips 28320df4899ba91fd7dfdd016052d828810e650f +nios2 f1f2eac9124bf0dc82b652871f9a596bce2d3e10 +openrisc 548dafe880ad84d0accc0a5596c26e3348b103e1 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd aa47b141a43ab3932c6c462c2a9ad7c34e9111a7 +powerpc d557b09800dab5dd6804e5b79324069abcf0be11 +powerpc-mpe d70a54e2d08510a99b1f10eceeae6f2f7086e226 +fsl 76f3e2929bb6b476fb02b519ad953e2e29ee7bd5 +mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +s390 fa0d0b064d550675b80df1e648888a9c97e313d3 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile c47b15c4928c46b889a1ea2e9b54f4110514e1c3 +uml 989e59fa41c5464ab77bf0bf82f32f721430544e +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 1f2fdbd0078cb2ad4251768e8c0e0bb652a2cbd6 +btrfs 1edb647bb95439d90c0017e9ca23c4ecf00a0409 +ceph 388cfdc9bc19cc189b86770dba55910018e8e0fc +cifs e44cac3a7848c3ebe30547b1d44a0a68feb1d20c +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 942080643bce061c3dd9d5718d3b745dcb39a8bc +ext3 f54e18f1b831c92f6512d2eedb224cd63d607d3d +ext4 50db71abc529c48b21f4c3034d3cff27cfb25795 +f2fs 635aee1fefef921ae4124b127fced62ea6008839 +fscache 1a8ed18fb7db48c916c2ccd484e04bd4dd737834 +fuse 1c68271cf1bfe7f3664b6dbf4ffd5fe11130be5c +gfs2 ec7d879c457611e540cb465c25f3040facbd1185 +jfs bb5e50aaa80564268f950d1b2f764455afbfea82 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs 388f0c776781fe64ce951701bfe712b2182a31f2 +nfsd 3c0aeb6da065c616653e6573016715f65640c27a +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +overlayfs 2b7a8f36f092a7855f6438cd42d6990394f450fa +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs f15844e0777fec936f87a87f97394f83911dacd3 +ubifs f38aed975c0c3645bbdfc5ebe35726e64caaf588 +xfs 6044e4386cd51dece882ea42352cdaaab0f24cad +file-locks 1b2b32dcdb3df28dd103033c73cac2417fa05845 +vfs e3bb504efd919f7bacd24cb14038953899b909e1 +pci 149792795d2bab33954bc025fcf145a8009683f6 +hid b104d8ba2a44ded4e0949ec922d02ba6f6d6f9d5 +i2c fe07adec730d271c91f4160f96a0f24fe7553c63 +jdelvare-hwmon ae530d4403e9a22363c275a82b46ecd95f939a04 +hwmon-staging 907a6d5824599d09e986105a5a880d119a996c4b +v4l-dvb 2ea3258b238cc194173fe4ed000c87f47267bada +kbuild 657eeca391288f24e794bc35ea9da2f1865216fd +kconfig 95edca5c523c4b404dd60baa0a1bea0e4c38fd72 +libata d325a876e2b357c67f1d0bf7a47fccf382db9c8b +pm 464ed18ebdb6236fcff59d2a35d4d2e28668435a +idle f7c0e22f2d14b9ad8400ee17061822e33c1d5e2f +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal 2707dbd09a859b7205917f9baf9d0192944ac46c +thermal-soc d8c3cd75e77d8033b29470525781befc11b6bf7d +ieee1394 d737d7da8e7e931360282199341f44ac0803c837 +dlm 2ab4bd8ea3a6954bc79a9bbeb291cd6c2d6213a7 +swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8 +slave-dma 9a0a47f5e620034a2085e3c6b93052a719c701e8 +net-next f96fe225677b3efb74346ebd56fafe3997b02afa +ipsec-next fbe68ee87522f6eaa10f9076c0a7117e1613f2f7 +wireless-next 81c412600f946fc1c8731685cb6c6fae8002043a +bluetooth 72e4a6bd02204eed0464d6139439d7e89b94266e +infiniband a7cfef21e3d066343bec14d3113a9f9c92d1c2a8 +mtd d6666be6f0c43efb9475d1d35fbef9f8be61b7b1 +l2-mtd 68f29815034e9dc9ed53cad85946c32b07adc8cc +crypto 8606813a6c8997fd3bb805186056d78670eb86ca +drm 4e0cd68115620bc3236ff4e58e4c073948629b41 +drm-panel 54cbc4e298ea68035618b46894aed1e439121e56 +drm-intel 5d77d9c5e177d2182df5d9fd61ba986facb64415 +drm-tegra 7e0180e3570cc791e95e6b6cd5fbeb0aedc62776 +drm-misc 6cadd306033e70b4edb136815807060e168cac67 +sound d70a1b9893f820fdbcdffac408c909c50f2e6b43 +sound-asoc 1affeb608ed9abf74e97b6a18e83b93bbb7d0214 +modules b0a65b0cccd477b2fd8b7adad0ac39433df54829 +virtio c91c2a63913b7ead21163fd8f0d1432031055920 +input dd9ce1902bbb0b625314bab3d870eab4669fea9d +input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +block e248d2ba00828f580da6bb706da304082c5aa192 +device-mapper 5164bece1673cdf04782f8ed3fba70743700f5da +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh d790be3863b28fd22e0781c1a3ddefcbfd5f7086 +kgdb 0f16996cf2ed7c368dd95b4c517ce572b96a10f5 +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md f851b60db0fd83a10034c5cc9d9e58c758457b1c +mfd a3b63979f8a32af9e975a793fd0f612d42072740 +backlight 3d6969a641d01cc9b6aa199a6f01eb1802522baf +battery 02088e3ed79f0639d71caeb3dd49d42f88746c88 +fbdev 718b90ac4c21c81f42b6db062ca0867f3cac7648 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 574d54112fdac339627939ca94851a09f0fe0cfa +regulator 1b475231d95e7a093795d5027e82844479b50ef9 +security b2d1965dcea148100ffc4e7199470bf5fad13871 +integrity 63a0eb7891bdf3ef32ecb6b01eb09106df646c10 +selinux 00fec2a10b51a071ec92da256ccd30f6b13fc55b +lblnet d8ec26d7f8287f5788a494f56e8814210f0e64be +watchdog 2193e69bf65054b2a48f45046faed8293f5e965b +iommu 76771c938e95ce4106c6e8092f4f614d4d1e0ecc +dwmw2-iommu 1860e379875dfe7271c649058aeddffe5afd9d0d +vfio 5e9f36c59a4883c6d8db4a3c097e4fc2234742de +osd 1fa3a002b2546c42c343c77c144871285896ced5 +jc_docs 9b64c09bb960b4ccae2a42e204cd70f83b115e3d +trivial 078014dd36989c66378dfe80066c3f8a1f6952e8 +audit 0288d7183c41c0192d2963d44590f346f4aee917 +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree c46ca3c8310b61d253a39ff1375ea97912794cd1 +dt-rh a0e27f51ba8a04125c22a95c4d3e98297a7191de +mailbox 9f3e3cacb2ffdefe28c7cf490bf543e4dcb2770a +spi bcfc4f40182c61da8ab2e071d2bad059420bd791 +tip aa0f6b220f8ab13da44f4155ee91544d3fd7519d +clockevents b0ad5917960ca80f96baeb427ec64a12c57f0c36 +edac fec53af531dd040e41fe358abe00b33747af2688 +edac-amd 50872ccd8786dc72bc5a32c17695561e031fae4c +irqchip 5cc8f658723f563f5018b6a1f56b53074cf4c9ed +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace 0daa2302968c13b657118d6ac92471f8fd2f3f28 +rcu 3cd05fcfa269703a677b41dd2fc5f7b9c8bb1f22 +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm 2c4aa55a6af070262cca425745e8e54310e96b8d +kvm-arm 05971120fca43e0357789a14b3386bb56eef2201 +kvm-ppc 476ce5ef09b21a76e74d07ff9d723ba0de49b53b +oprofile 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip 2e917175e1ef147a527a9158b9f09773ec94c0bd +percpu bfaa047a9415d37efaf44fefefa377735d97598c +workqueues 008847f66c38712f2819cd956969519006ebc11d +drivers-x86 200db647112d9a0f1dce273604f949f916bd2426 +chrome-platform 5502486a2077e4280c618b82e8a77ed35932956f +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 270ded427d7b70972e492501d64ad42e09da5ea5 +hsi d95dc9e388104488d0f5a5969c435e601840da2e +leds 2969bb18f8895eb4e0fbbc98efe706f15a3acff5 +ipmi 98e0721c20dbd1da987e551d1b70e8e92be21c71 +driver-core 2dbfca5a181973558277b28b1f4c36362291f5e0 +tty 2dbfca5a181973558277b28b1f4c36362291f5e0 +usb 2dbfca5a181973558277b28b1f4c36362291f5e0 +usb-gadget ebf3992061db1f7b3aa093f37fb308acc74fbc82 +usb-serial e7181d005e84b15fe3121a8d22840adc3395d496 +staging 2dbfca5a181973558277b28b1f4c36362291f5e0 +char-misc 67e2c3883828b39548cee2091b36656787775d95 +cgroup eeecbd1971517103e06f11750dd1a9a1dc37e4e6 +scsi 49f096fcbaecda7d272e9d67ecd424a36b1d409b +target-updates ae450e246e8540300699480a3780a420a028b73f +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +writeback f9b0e058cbd04ada76b13afffa7e1df830543c24 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl 96dfdff694aeeb8f2ab4858bb81400c8b30daf53 +vhost 5ff16110c637726111662c1df41afd9df7ef36bd +remoteproc 9a3c4145af32125c5ee39c0272662b47307a8323 +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio 170680abd1eb98a9773ed068435fef9a6402a10f +dma-mapping dda02fd6278d9e995850b3c1dba484f17cbe4de4 +pwm 39e046f2c1dd0742976d7ee6e464744cf2122f41 +dma-buf 101e31050bf174e5bcca72bdb9d0bd392aa4f966 +userns db86da7cb76f797a1a8b445166a15cb922c6ff85 +ktest 17150fef4ab1f48d838008657cdaa168453a9fa6 +signal 20b4fb485227404329e41ad15588afad3df23050 +clk f1e9203e2366164b832d8a6ce10134de8c575178 +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +aio 5f785de588735306ec4d7c875caf9d28481c8b21 +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +documentation 0415447aa3b4decc2c05dfc45a0aa34a5eb4fc54 +kselftest 0df1f2487d2f0d04703f142813d53615d62a1da4 +y2038 45446a99cef65aba81c0e59279f100bdb5624acd +luto-misc 6ce4436c9cbe903af935291aa219fd6f4c85722d +access_once 5de72a2247ac05bde7c89039631b3d0c6186fafb +akpm-current 350b61c87ab5b359da2269d02be4ca0fe5f81c97 +akpm 9242687a46020249abd781a7b32780802e2a42f2 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..f579c41beb82 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,235 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-fixes +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +devicetree-current git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.rocketboards.org/linux-socfpga-next.git#nios2-next +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git#master +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +logfs git git://github.com/prasad-joshi/logfs_upstream.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +omfs git git://github.com/bcopeland/omfs.git#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux-3/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm-intel#topic/core-stuff +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +virtio git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +input-mt git git://github.com/rydberg/linux.git#for-next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.infradead.org/battery-2.6.git#master +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git#for-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/pcmoore/audit#next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +tiny git git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git#tiny/next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +uprobes git git://github.com/srikard/linux.git#for-next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +fw-nohz git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#nohz/next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git#for-next +ipmi git git://git.code.sf.net/p/openipmi/linux-ipmi#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +signal git git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next +clk git git://git.linaro.org/people/mturquette/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +lzo-update git git://github.com/markus-oberhumer/linux.git#lzo-update +aio git git://git.kvack.org/~bcrl/aio-next.git#master +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +documentation git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +access_once git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +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..e736795a8340 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2132 @@ +$ date +Sunday 21 December 17:50:26 AEDT 2014 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 00c845dbfe2e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net +Merging origin/master (97bf6af1f928 Linux 3.19-rc1) +$ git merge origin/master +Updating 00c845dbfe2e..97bf6af1f928 +Fast-forward + .gitignore | 3 + + .mailmap | 4 +- + CREDITS | 6 +- + .../ABI/testing/sysfs-platform-dell-laptop | 60 + + Documentation/DocBook/media/v4l/compat.xml | 12 + + Documentation/DocBook/media/v4l/pixfmt.xml | 36 +- + Documentation/DocBook/media/v4l/subdev-formats.xml | 18 +- + Documentation/DocBook/media/v4l/v4l2.xml | 11 +- + Documentation/clk.txt | 2 +- + .../devicetree/bindings/clock/exynos4415-clock.txt | 38 + + .../devicetree/bindings/clock/exynos7-clock.txt | 93 + + .../devicetree/bindings/clock/marvell,mmp2.txt | 21 + + .../devicetree/bindings/clock/marvell,pxa168.txt | 21 + + .../devicetree/bindings/clock/marvell,pxa910.txt | 21 + + .../bindings/clock/renesas,cpg-div6-clocks.txt | 18 +- + .../bindings/clock/renesas,cpg-mstp-clocks.txt | 8 +- + Documentation/devicetree/bindings/clock/sunxi.txt | 31 +- + Documentation/devicetree/bindings/i2c/i2c-opal.txt | 37 + + .../devicetree/bindings/media/rcar_vin.txt | 2 + + Documentation/kernel-parameters.txt | 9 + + Documentation/video4linux/vivid.txt | 15 + + Documentation/x86/intel_mpx.txt | 18 +- + MAINTAINERS | 13 +- + Makefile | 21 +- + arch/arm/boot/dts/Makefile | 3 + + arch/arm/boot/dts/mmp2-brownstone.dts | 2 +- + arch/arm/boot/dts/mmp2.dtsi | 29 +- + arch/arm/boot/dts/pxa168-aspenite.dts | 2 +- + arch/arm/boot/dts/pxa168.dtsi | 27 +- + arch/arm/boot/dts/pxa910-dkb.dts | 2 +- + arch/arm/boot/dts/pxa910.dtsi | 28 +- + arch/arm/boot/dts/sun4i-a10.dtsi | 12 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 12 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 12 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 12 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 12 +- + arch/arm/boot/dts/sun8i-a23.dtsi | 12 +- + arch/arm/configs/ape6evm_defconfig | 2 +- + arch/arm/configs/armadillo800eva_defconfig | 2 +- + arch/arm/configs/bcm_defconfig | 2 +- + arch/arm/configs/bockw_defconfig | 2 +- + arch/arm/configs/davinci_all_defconfig | 2 +- + arch/arm/configs/exynos_defconfig | 2 +- + arch/arm/configs/ezx_defconfig | 1 - + arch/arm/configs/hisi_defconfig | 2 +- + arch/arm/configs/imote2_defconfig | 1 - + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/configs/keystone_defconfig | 2 +- + arch/arm/configs/kzm9g_defconfig | 2 +- + arch/arm/configs/lager_defconfig | 2 +- + arch/arm/configs/mackerel_defconfig | 1 - + arch/arm/configs/marzen_defconfig | 2 +- + arch/arm/configs/omap1_defconfig | 1 - + arch/arm/configs/prima2_defconfig | 2 +- + arch/arm/configs/sama5_defconfig | 2 +- + arch/arm/configs/shmobile_defconfig | 2 +- + arch/arm/configs/sunxi_defconfig | 2 +- + arch/arm/configs/tegra_defconfig | 2 +- + arch/arm/configs/u8500_defconfig | 2 +- + arch/arm/configs/vt8500_v6_v7_defconfig | 2 +- + arch/arm/include/asm/spinlock.h | 4 +- + arch/arm/kernel/perf_event.c | 2 +- + arch/arm/mach-davinci/pm_domain.c | 2 +- + arch/arm/mach-exynos/Kconfig | 2 +- + arch/arm/mach-keystone/pm_domain.c | 2 +- + arch/arm/mach-mmp/Kconfig | 12 +- + arch/arm/mach-mmp/mmp-dt.c | 57 +- + arch/arm/mach-mmp/mmp2-dt.c | 26 +- + arch/arm/mach-omap1/pm_bus.c | 4 +- + arch/arm/mach-omap2/Kconfig | 6 +- + arch/arm/mach-omap2/cclock3xxx_data.c | 23 +- + arch/arm/mach-omap2/dpll3xxx.c | 6 +- + arch/arm/mach-omap2/dpll44xx.c | 6 +- + arch/arm/mach-omap2/io.c | 2 +- + arch/arm/mach-omap2/omap_device.c | 2 +- + arch/arm64/include/asm/spinlock.h | 4 +- + arch/cris/arch-v10/lib/usercopy.c | 14 +- + arch/cris/arch-v32/drivers/Kconfig | 8 +- + arch/cris/arch-v32/drivers/Makefile | 1 - + arch/cris/arch-v32/drivers/i2c.h | 1 - + arch/cris/arch-v32/drivers/sync_serial.c | 1430 ++++++------ + arch/cris/arch-v32/kernel/debugport.c | 82 +- + arch/cris/arch-v32/kernel/time.c | 29 +- + arch/cris/arch-v32/lib/usercopy.c | 15 +- + arch/cris/arch-v32/mach-fs/pinmux.c | 152 +- + arch/cris/include/arch-v32/mach-fs/mach/pinmux.h | 2 - + arch/cris/include/asm/Kbuild | 4 - + arch/cris/include/uapi/asm/Kbuild | 4 +- + arch/cris/kernel/crisksyms.c | 9 +- + arch/cris/kernel/traps.c | 61 +- + arch/cris/mm/init.c | 38 +- + arch/cris/mm/ioremap.c | 3 +- + arch/hexagon/include/asm/cache.h | 4 +- + arch/hexagon/include/asm/cacheflush.h | 36 +- + arch/hexagon/include/asm/io.h | 5 - + arch/hexagon/kernel/setup.c | 1 + + arch/hexagon/kernel/traps.c | 4 +- + arch/hexagon/kernel/vmlinux.lds.S | 4 +- + arch/hexagon/mm/cache.c | 10 + + arch/hexagon/mm/ioremap.c | 1 + + arch/ia64/Kconfig | 2 +- + arch/ia64/include/asm/percpu.h | 4 +- + arch/mips/alchemy/common/clock.c | 10 +- + arch/mips/configs/db1xxx_defconfig | 2 +- + arch/mips/configs/lemote2f_defconfig | 1 - + arch/mips/configs/loongson3_defconfig | 2 +- + arch/mips/configs/nlm_xlp_defconfig | 2 +- + arch/mips/configs/nlm_xlr_defconfig | 2 +- + arch/mips/mm/gup.c | 2 +- + arch/powerpc/configs/ps3_defconfig | 2 +- + arch/powerpc/include/asm/cpuidle.h | 20 + + arch/powerpc/include/asm/opal.h | 42 + + arch/powerpc/include/asm/paca.h | 10 + + arch/powerpc/include/asm/ppc-opcode.h | 2 + + arch/powerpc/include/asm/processor.h | 3 +- + arch/powerpc/include/asm/reg.h | 4 + + arch/powerpc/include/asm/syscall.h | 6 +- + arch/powerpc/include/asm/uaccess.h | 6 +- + arch/powerpc/kernel/asm-offsets.c | 11 + + arch/powerpc/kernel/exceptions-64s.S | 35 +- + arch/powerpc/kernel/idle_power7.S | 344 ++- + arch/powerpc/kernel/smp.c | 9 +- + arch/powerpc/perf/hv-24x7.c | 23 +- + arch/powerpc/platforms/powernv/opal-wrappers.S | 39 + + arch/powerpc/platforms/powernv/opal.c | 50 +- + arch/powerpc/platforms/powernv/powernv.h | 2 + + arch/powerpc/platforms/powernv/setup.c | 166 ++ + arch/powerpc/platforms/powernv/smp.c | 29 +- + arch/powerpc/platforms/powernv/subcore.c | 34 + + arch/powerpc/platforms/powernv/subcore.h | 9 +- + arch/s390/kvm/gaccess.c | 18 +- + arch/sh/Kconfig | 2 +- + arch/sh/configs/apsh4ad0a_defconfig | 2 +- + arch/sh/configs/sdk7786_defconfig | 2 +- + arch/x86/Kconfig | 36 +- + arch/x86/include/asm/hw_irq.h | 84 +- + arch/x86/include/asm/io_apic.h | 35 +- + arch/x86/include/asm/irq_vectors.h | 6 + + arch/x86/include/asm/pci.h | 3 + + arch/x86/include/asm/pci_x86.h | 2 + + arch/x86/include/asm/spinlock.h | 8 +- + arch/x86/include/uapi/asm/ldt.h | 7 + + arch/x86/kernel/acpi/boot.c | 99 +- + arch/x86/kernel/apic/Makefile | 4 +- + arch/x86/kernel/apic/apic.c | 22 +- + arch/x86/kernel/apic/htirq.c | 107 + + arch/x86/kernel/apic/io_apic.c | 1368 +++--------- + arch/x86/kernel/apic/msi.c | 286 +++ + arch/x86/kernel/apic/vector.c | 719 ++++++ + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 22 +- + arch/x86/kernel/crash.c | 1 + + arch/x86/kernel/entry_32.S | 4 +- + arch/x86/kernel/entry_64.S | 4 +- + arch/x86/kernel/irqinit.c | 35 +- + arch/x86/kernel/machine_kexec_32.c | 1 + + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/reboot.c | 1 + + arch/x86/kernel/smpboot.c | 8 +- + arch/x86/kernel/tls.c | 6 - + arch/x86/kernel/traps.c | 2 +- + arch/x86/lguest/boot.c | 2 +- + arch/x86/mm/gup.c | 2 +- + arch/x86/pci/intel_mid_pci.c | 10 +- + arch/x86/pci/irq.c | 25 +- + arch/x86/platform/uv/uv_irq.c | 6 +- + drivers/acpi/blacklist.c | 54 - + drivers/acpi/device_pm.c | 12 +- + drivers/acpi/ec.c | 2 + + drivers/acpi/fan.c | 8 +- + drivers/acpi/pci_irq.c | 11 +- + drivers/acpi/processor_core.c | 9 +- + drivers/acpi/resource.c | 2 +- + drivers/acpi/scan.c | 4 +- + drivers/acpi/utils.c | 12 +- + drivers/acpi/video.c | 10 +- + drivers/ata/Kconfig | 2 +- + drivers/base/power/opp.c | 78 +- + drivers/clk/at91/clk-programmable.c | 4 +- + drivers/clk/bcm/clk-kona.c | 4 +- + drivers/clk/clk-composite.c | 9 +- + drivers/clk/clk-mux.c | 2 +- + drivers/clk/clk-s2mps11.c | 2 +- + drivers/clk/clk.c | 42 +- + drivers/clk/hisilicon/clk-hi3620.c | 72 +- + drivers/clk/mmp/Makefile | 7 +- + drivers/clk/mmp/clk-frac.c | 74 +- + drivers/clk/mmp/clk-gate.c | 133 ++ + drivers/clk/mmp/clk-mix.c | 513 +++++ + drivers/clk/mmp/clk-mmp2.c | 6 +- + drivers/clk/mmp/clk-of-mmp2.c | 334 +++ + drivers/clk/mmp/clk-of-pxa168.c | 279 +++ + drivers/clk/mmp/clk-of-pxa910.c | 301 +++ + drivers/clk/mmp/clk-pxa168.c | 6 +- + drivers/clk/mmp/clk-pxa910.c | 6 +- + drivers/clk/mmp/clk.c | 192 ++ + drivers/clk/mmp/clk.h | 226 +- + drivers/clk/mmp/reset.c | 99 + + drivers/clk/mmp/reset.h | 31 + + drivers/clk/pxa/Makefile | 1 + + drivers/clk/pxa/clk-pxa.c | 45 +- + drivers/clk/pxa/clk-pxa.h | 9 +- + drivers/clk/pxa/clk-pxa25x.c | 273 +++ + drivers/clk/pxa/clk-pxa27x.c | 9 +- + drivers/clk/qcom/clk-pll.c | 2 +- + drivers/clk/qcom/clk-rcg.c | 20 +- + drivers/clk/qcom/clk-rcg2.c | 28 +- + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-mmc-phase.c | 154 ++ + drivers/clk/rockchip/clk-pll.c | 81 +- + drivers/clk/rockchip/clk-rk3188.c | 79 +- + drivers/clk/rockchip/clk-rk3288.c | 246 ++- + drivers/clk/rockchip/clk.c | 20 +- + drivers/clk/rockchip/clk.h | 45 +- + drivers/clk/samsung/Makefile | 2 + + drivers/clk/samsung/clk-exynos-audss.c | 33 +- + drivers/clk/samsung/clk-exynos4.c | 2 +- + drivers/clk/samsung/clk-exynos4415.c | 1144 ++++++++++ + drivers/clk/samsung/clk-exynos5260.c | 185 +- + drivers/clk/samsung/clk-exynos7.c | 743 +++++++ + drivers/clk/samsung/clk-pll.c | 25 +- + drivers/clk/samsung/clk-pll.h | 4 + + drivers/clk/samsung/clk.c | 102 +- + drivers/clk/samsung/clk.h | 43 +- + drivers/clk/shmobile/clk-div6.c | 113 +- + drivers/clk/sunxi/Makefile | 1 + + drivers/clk/sunxi/clk-a20-gmac.c | 7 +- + drivers/clk/sunxi/clk-factors.c | 6 +- + drivers/clk/sunxi/clk-factors.h | 3 +- + drivers/clk/sunxi/clk-mod0.c | 1 + + drivers/clk/sunxi/clk-sun6i-ar100.c | 4 +- + drivers/clk/sunxi/clk-sun8i-mbus.c | 1 + + drivers/clk/sunxi/clk-sun9i-core.c | 271 +++ + drivers/clk/sunxi/clk-sunxi.c | 85 +- + drivers/cpufreq/intel_pstate.c | 38 +- + drivers/cpufreq/longhaul.c | 4 +- + drivers/cpufreq/powernow-k6.c | 2 +- + drivers/cpufreq/powernow-k7.c | 3 +- + drivers/cpufreq/speedstep-ich.c | 3 +- + drivers/cpuidle/cpuidle-powernv.c | 10 +- + drivers/i2c/busses/Kconfig | 12 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-mv64xxx.c | 328 +-- + drivers/i2c/busses/i2c-opal.c | 294 +++ + drivers/i2c/busses/i2c-sh_mobile.c | 112 +- + drivers/infiniband/Kconfig | 11 + + drivers/infiniband/core/Makefile | 1 + + drivers/infiniband/core/addr.c | 4 +- + drivers/infiniband/core/multicast.c | 11 +- + drivers/infiniband/core/umem.c | 72 +- + drivers/infiniband/core/umem_odp.c | 668 ++++++ + drivers/infiniband/core/umem_rbtree.c | 94 + + drivers/infiniband/core/uverbs.h | 1 + + drivers/infiniband/core/uverbs_cmd.c | 171 +- + drivers/infiniband/core/uverbs_main.c | 5 +- + drivers/infiniband/core/verbs.c | 3 +- + drivers/infiniband/hw/amso1100/c2_provider.c | 2 +- + drivers/infiniband/hw/cxgb4/cm.c | 7 +- + drivers/infiniband/hw/cxgb4/device.c | 2 +- + drivers/infiniband/hw/cxgb4/mem.c | 28 +- + drivers/infiniband/hw/cxgb4/qp.c | 2 +- + drivers/infiniband/hw/ehca/ehca_mrmw.c | 2 +- + drivers/infiniband/hw/ipath/ipath_mr.c | 2 +- + drivers/infiniband/hw/mlx4/mr.c | 1 - + drivers/infiniband/hw/mlx5/Makefile | 1 + + drivers/infiniband/hw/mlx5/main.c | 45 +- + drivers/infiniband/hw/mlx5/mem.c | 69 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 116 +- + drivers/infiniband/hw/mlx5/mr.c | 323 ++- + drivers/infiniband/hw/mlx5/odp.c | 798 +++++++ + drivers/infiniband/hw/mlx5/qp.c | 197 +- + drivers/infiniband/hw/nes/nes_verbs.c | 6 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 5 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +- + drivers/infiniband/hw/qib/qib_mr.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 19 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 18 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 27 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 49 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 239 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 22 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 104 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 30 +- + drivers/infiniband/ulp/iser/iser_initiator.c | 6 +- + drivers/infiniband/ulp/iser/iser_memory.c | 102 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 91 +- + drivers/infiniband/ulp/isert/ib_isert.c | 1599 +++++++------- + drivers/infiniband/ulp/isert/ib_isert.h | 80 +- + drivers/infiniband/ulp/srp/ib_srp.c | 3 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 10 +- + drivers/iommu/amd_iommu.c | 14 +- + drivers/iommu/intel_irq_remapping.c | 10 +- + drivers/iommu/irq_remapping.c | 6 +- + drivers/leds/leds-gpio.c | 2 +- + drivers/macintosh/Kconfig | 10 - + drivers/macintosh/Makefile | 1 - + drivers/macintosh/therm_pm72.c | 2278 -------------------- + drivers/macintosh/therm_pm72.h | 326 --- + drivers/media/Kconfig | 1 - + drivers/media/Makefile | 2 +- + drivers/media/i2c/Kconfig | 9 - + drivers/media/i2c/Makefile | 1 - + drivers/media/pci/cx88/cx88-blackbird.c | 4 +- + drivers/media/pci/cx88/cx88-dvb.c | 4 +- + drivers/media/pci/cx88/cx88-mpeg.c | 11 +- + drivers/media/pci/cx88/cx88-vbi.c | 9 +- + drivers/media/pci/cx88/cx88-video.c | 18 +- + drivers/media/pci/cx88/cx88.h | 2 + + drivers/media/platform/Kconfig | 10 +- + drivers/media/platform/Makefile | 3 - + drivers/media/platform/s5p-tv/Kconfig | 2 +- + drivers/media/platform/soc_camera/rcar_vin.c | 466 +++- + drivers/media/platform/vivid/vivid-vid-out.c | 2 +- + drivers/media/usb/Kconfig | 1 - + drivers/media/usb/Makefile | 1 - + drivers/media/v4l2-core/v4l2-ioctl.c | 6 + + drivers/misc/cxl/context.c | 26 +- + drivers/misc/cxl/cxl.h | 9 +- + drivers/misc/cxl/file.c | 6 +- + drivers/misc/cxl/native.c | 12 +- + drivers/misc/cxl/pci.c | 2 +- + drivers/misc/cxl/sysfs.c | 10 +- + drivers/misc/mic/host/mic_debugfs.c | 18 +- + drivers/mmc/host/atmel-mci.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 40 + + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 119 + + drivers/nfc/trf7970a.c | 2 +- + drivers/pci/Kconfig | 9 +- + drivers/pci/Makefile | 2 - + drivers/pci/hotplug/ibmphp_core.c | 6 +- + drivers/pci/ioapic.c | 121 -- + drivers/phy/phy-omap-usb2.c | 2 +- + drivers/phy/phy-ti-pipe3.c | 2 +- + drivers/platform/x86/Kconfig | 7 +- + drivers/platform/x86/acerhdf.c | 265 ++- + drivers/platform/x86/asus-laptop.c | 3 +- + drivers/platform/x86/asus-nb-wmi.c | 9 + + drivers/platform/x86/asus-wmi.c | 3 +- + drivers/platform/x86/dell-laptop.c | 1057 ++++++++- + drivers/platform/x86/dell-smo8800.c | 10 +- + drivers/platform/x86/dell-wmi.c | 176 +- + drivers/platform/x86/eeepc-laptop.c | 213 +- + drivers/platform/x86/fujitsu-laptop.c | 6 +- + drivers/platform/x86/hp-wireless.c | 3 + + drivers/platform/x86/hp_accel.c | 1 + + drivers/platform/x86/ideapad-laptop.c | 3 +- + drivers/platform/x86/intel_ips.c | 2 +- + drivers/platform/x86/intel_oaktrail.c | 3 +- + drivers/platform/x86/msi-laptop.c | 2 +- + drivers/platform/x86/msi-wmi.c | 3 +- + drivers/platform/x86/sony-laptop.c | 6 +- + drivers/platform/x86/thinkpad_acpi.c | 116 +- + drivers/platform/x86/toshiba_acpi.c | 166 +- + drivers/power/pm2301_charger.c | 4 - + drivers/scsi/53c700.c | 41 +- + drivers/scsi/Kconfig | 17 +- + drivers/scsi/advansys.c | 8 +- + drivers/scsi/aic94xx/aic94xx_init.c | 1 - + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 1 - + drivers/scsi/bnx2fc/bnx2fc_io.c | 6 +- + drivers/scsi/csiostor/csio_scsi.c | 5 +- + drivers/scsi/esas2r/esas2r_flash.c | 4 +- + drivers/scsi/esas2r/esas2r_main.c | 1 - + drivers/scsi/fcoe/fcoe.c | 1 - + drivers/scsi/fnic/fnic_main.c | 1 - + drivers/scsi/ibmvscsi/ibmvfc.c | 2 - + drivers/scsi/ipr.c | 116 +- + drivers/scsi/ipr.h | 4 +- + drivers/scsi/isci/init.c | 1 - + drivers/scsi/libsas/sas_scsi_host.c | 8 - + drivers/scsi/lpfc/lpfc_scsi.c | 2 - + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 1 - + drivers/scsi/mpt2sas/mpt2sas_transport.c | 5 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1 - + drivers/scsi/mpt3sas/mpt3sas_transport.c | 5 +- + drivers/scsi/mvsas/mv_init.c | 1 - + drivers/scsi/pm8001/pm8001_init.c | 1 - + drivers/scsi/pmcraid.c | 1 - + drivers/scsi/qla2xxx/qla_init.c | 2 - + drivers/scsi/qla2xxx/qla_os.c | 1 - + drivers/scsi/qla2xxx/qla_target.c | 12 +- + drivers/scsi/scsi.c | 22 - + drivers/scsi/scsi_debug.c | 62 +- + drivers/scsi/scsi_devinfo.c | 1 + + drivers/scsi/scsi_lib.c | 4 +- + drivers/scsi/scsi_pm.c | 10 - + drivers/scsi/scsi_priv.h | 5 +- + drivers/scsi/scsi_sysfs.c | 30 +- + drivers/scsi/scsi_transport_spi.c | 2 +- + drivers/scsi/storvsc_drv.c | 7 +- + drivers/scsi/ufs/ufshcd-pci.c | 11 +- + drivers/scsi/ufs/ufshcd-pltfrm.c | 11 +- + drivers/spi/spi-coldfire-qspi.c | 2 +- + drivers/spi/spi-img-spfi.c | 4 +- + drivers/spi/spi-meson-spifc.c | 4 +- + drivers/spi/spi-orion.c | 2 +- + drivers/spi/spi-pxa2xx.c | 2 +- + drivers/spi/spi-qup.c | 4 +- + drivers/spi/spi-rockchip.c | 4 +- + drivers/spi/spi-s3c64xx.c | 4 +- + drivers/staging/gdm72xx/Kconfig | 2 +- + .../lustre/lustre/include/linux/lustre_compat25.h | 24 - + drivers/staging/lustre/lustre/llite/dir.c | 2 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 17 +- + drivers/staging/media/Kconfig | 6 + + drivers/staging/media/Makefile | 3 + + drivers/{ => staging}/media/parport/Kconfig | 24 +- + drivers/{ => staging}/media/parport/Makefile | 0 + drivers/{ => staging}/media/parport/bw-qcam.c | 0 + drivers/{ => staging}/media/parport/c-qcam.c | 0 + drivers/{ => staging}/media/parport/pms.c | 0 + drivers/{ => staging}/media/parport/w9966.c | 0 + .../{media/usb => staging/media}/tlg2300/Kconfig | 6 +- + .../{media/usb => staging/media}/tlg2300/Makefile | 0 + .../{media/usb => staging/media}/tlg2300/pd-alsa.c | 0 + .../usb => staging/media}/tlg2300/pd-common.h | 0 + .../{media/usb => staging/media}/tlg2300/pd-dvb.c | 0 + .../{media/usb => staging/media}/tlg2300/pd-main.c | 0 + .../usb => staging/media}/tlg2300/pd-radio.c | 0 + .../usb => staging/media}/tlg2300/pd-video.c | 0 + .../usb => staging/media}/tlg2300/vendorcmds.h | 0 + drivers/staging/media/vino/Kconfig | 24 + + drivers/staging/media/vino/Makefile | 3 + + .../platform => staging/media/vino}/indycam.c | 0 + .../platform => staging/media/vino}/indycam.h | 0 + .../{media/i2c => staging/media/vino}/saa7191.c | 0 + .../{media/i2c => staging/media/vino}/saa7191.h | 0 + .../{media/platform => staging/media/vino}/vino.c | 0 + .../{media/platform => staging/media/vino}/vino.h | 0 + drivers/target/iscsi/iscsi_target.c | 15 +- + drivers/target/iscsi/iscsi_target_core.h | 1 - + drivers/target/iscsi/iscsi_target_login.c | 11 +- + drivers/target/iscsi/iscsi_target_tpg.c | 1 - + drivers/target/iscsi/iscsi_target_transport.c | 3 +- + drivers/target/iscsi/iscsi_target_util.c | 26 +- + drivers/target/loopback/tcm_loop.c | 71 +- + drivers/target/loopback/tcm_loop.h | 7 +- + drivers/target/sbp/sbp_target.c | 2 +- + drivers/target/target_core_configfs.c | 344 +-- + drivers/target/target_core_device.c | 90 +- + drivers/target/target_core_file.c | 42 + + drivers/target/target_core_hba.c | 7 +- + drivers/target/target_core_iblock.c | 42 + + drivers/target/target_core_internal.h | 28 - + drivers/target/target_core_pr.c | 125 +- + drivers/target/target_core_pscsi.c | 28 +- + drivers/target/target_core_rd.c | 41 + + drivers/target/target_core_sbc.c | 2 +- + drivers/target/target_core_spc.c | 4 +- + drivers/target/target_core_transport.c | 16 +- + drivers/target/target_core_user.c | 42 + + drivers/target/tcm_fc/tfc_cmd.c | 8 +- + drivers/thermal/intel_powerclamp.c | 2 - + drivers/tty/serial/8250/8250_dw.c | 2 +- + drivers/tty/serial/8250/8250_mtk.c | 2 +- + drivers/tty/serial/8250/8250_omap.c | 14 +- + drivers/tty/serial/mfd.c | 7 +- + drivers/tty/serial/msm_serial_hs.c | 2 +- + drivers/tty/serial/omap-serial.c | 2 +- + drivers/usb/core/Kconfig | 2 +- + drivers/usb/gadget/legacy/tcm_usb_gadget.c | 10 +- + drivers/usb/host/isp1760-hcd.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + drivers/usb/phy/Kconfig | 4 +- + drivers/usb/storage/Kconfig | 2 +- + drivers/vhost/vringh.c | 125 +- + drivers/video/fbdev/s3c-fb.c | 2 +- + drivers/video/fbdev/sh_mobile_meram.c | 4 +- + drivers/virtio/virtio.c | 37 +- + drivers/virtio/virtio_pci_common.c | 39 +- + drivers/virtio/virtio_pci_common.h | 7 +- + drivers/virtio/virtio_pci_legacy.c | 24 +- + drivers/watchdog/imx2_wdt.c | 47 + + drivers/xen/xen-scsiback.c | 2 +- + fs/binfmt_misc.c | 7 +- + fs/btrfs/ctree.h | 4 +- + fs/btrfs/disk-io.c | 6 - + fs/btrfs/extent-tree.c | 23 +- + fs/btrfs/free-space-cache.c | 12 +- + fs/btrfs/volumes.c | 2 +- + fs/ecryptfs/crypto.c | 1 - + fs/ecryptfs/file.c | 12 - + fs/ecryptfs/keystore.c | 6 +- + fs/ecryptfs/main.c | 16 +- + fs/ext4/move_extent.c | 4 - + fs/hfsplus/catalog.c | 89 +- + fs/hfsplus/dir.c | 11 +- + fs/hfsplus/hfsplus_fs.h | 4 +- + fs/hfsplus/super.c | 4 +- + fs/kernfs/file.c | 22 - + fs/ocfs2/alloc.c | 28 +- + fs/ocfs2/alloc.h | 2 +- + fs/ocfs2/aops.c | 16 +- + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/dlm/dlmmaster.c | 12 +- + fs/ocfs2/file.c | 2 +- + fs/proc/meminfo.c | 15 +- + fs/proc/stat.c | 2 +- + fs/proc_namespace.c | 16 +- + include/acpi/acpi_bus.h | 1 + + include/dt-bindings/clock/exynos4415.h | 360 ++++ + include/dt-bindings/clock/exynos7-clk.h | 92 + + include/dt-bindings/clock/marvell,mmp2.h | 74 + + include/dt-bindings/clock/marvell,pxa168.h | 57 + + include/dt-bindings/clock/marvell,pxa910.h | 54 + + include/dt-bindings/clock/rk3288-cru.h | 13 + + include/linux/acpi.h | 1 + + include/linux/clk-provider.h | 8 +- + include/linux/clk/ti.h | 4 +- + include/linux/cma.h | 1 + + include/linux/compiler.h | 74 + + include/linux/devfreq.h | 2 +- + include/linux/kernel_stat.h | 1 + + include/linux/migrate.h | 10 - + include/linux/mlx5/device.h | 72 +- + include/linux/mlx5/driver.h | 14 +- + include/linux/mlx5/qp.h | 65 + + include/linux/mm.h | 2 - + include/linux/module.h | 16 +- + include/linux/pci.h | 1 + + include/linux/pm.h | 2 - + include/linux/uio.h | 5 + + include/linux/virtio_config.h | 29 +- + include/linux/vringh.h | 37 +- + include/rdma/ib_umem.h | 34 +- + include/rdma/ib_umem_odp.h | 160 ++ + include/rdma/ib_verbs.h | 54 +- + include/scsi/libsas.h | 1 - + include/scsi/scsi_device.h | 4 +- + include/scsi/scsi_host.h | 13 - + include/scsi/scsi_tcq.h | 36 - + include/target/target_core_backend.h | 43 + + include/target/target_core_backend_configfs.h | 120 ++ + include/target/target_core_base.h | 6 + + include/trace/events/module.h | 2 +- + include/trace/events/target.h | 8 +- + include/uapi/linux/audit.h | 2 + + include/uapi/linux/target_core_user.h | 4 - + include/uapi/linux/v4l2-mediabus.h | 6 +- + include/uapi/linux/virtio_pci.h | 15 +- + include/uapi/rdma/ib_user_verbs.h | 29 +- + init/do_mounts.c | 6 +- + kernel/events/core.c | 4 +- + kernel/irq/internals.h | 4 + + kernel/irq/irqdesc.c | 52 + + kernel/irq/proc.c | 22 +- + kernel/module.c | 170 +- + kernel/params.c | 97 +- + kernel/power/Kconfig | 16 +- + kernel/time/tick-sched.c | 2 - + kernel/trace/Makefile | 2 +- + lib/bug.c | 20 +- + lib/show_mem.c | 6 + + mm/cma.c | 1 + + mm/filemap.c | 2 +- + mm/gup.c | 2 +- + mm/memory.c | 17 +- + mm/mempolicy.c | 15 +- + mm/migrate.c | 21 - + mm/page_alloc.c | 6 +- + mm/rmap.c | 3 +- + mm/shmem.c | 2 +- + mm/zsmalloc.c | 374 ++-- + net/socket.c | 1 - + scripts/Kbuild.include | 12 + + scripts/Makefile.clean | 10 +- + scripts/Makefile.headersinst | 1 - + scripts/coccinelle/misc/bugon.cocci | 2 +- + scripts/headers.sh | 2 - + scripts/kconfig/mconf.c | 4 +- + scripts/kconfig/menu.c | 4 +- + scripts/package/mkspec | 4 + + sound/firewire/oxfw/oxfw-pcm.c | 6 +- + sound/firewire/oxfw/oxfw-proc.c | 2 +- + sound/firewire/oxfw/oxfw-stream.c | 3 +- + sound/firewire/oxfw/oxfw.c | 2 +- + sound/pci/asihpi/hpi_internal.h | 6 +- + sound/pci/asihpi/hpi_version.h | 6 +- + sound/pci/asihpi/hpidspcd.c | 26 +- + sound/pci/hda/hda_controller.c | 2 +- + sound/pci/hda/hda_generic.c | 10 +- + sound/pci/hda/hda_generic.h | 9 +- + sound/pci/hda/hda_intel.c | 5 +- + sound/pci/hda/hda_sysfs.c | 2 +- + sound/pci/hda/patch_analog.c | 42 +- + sound/pci/hda/patch_conexant.c | 4 +- + sound/pci/hda/patch_hdmi.c | 6 +- + sound/pci/hda/patch_realtek.c | 15 + + sound/pci/hda/patch_via.c | 2 +- + sound/soc/atmel/atmel_ssc_dai.c | 2 +- + sound/soc/codecs/Kconfig | 2 + + sound/soc/codecs/cs35l32.c | 2 +- + sound/soc/codecs/cs42xx8.c | 2 +- + sound/soc/codecs/max98090.c | 2 +- + sound/soc/codecs/pcm512x-i2c.c | 7 +- + sound/soc/codecs/pcm512x.c | 2 +- + sound/soc/codecs/rt5645.c | 4 + + sound/soc/codecs/tas2552.c | 4 +- + sound/soc/codecs/wm2200.c | 2 +- + sound/soc/codecs/wm5100.c | 2 +- + sound/soc/codecs/wm8962.c | 2 +- + sound/soc/fsl/fsl_asrc.c | 4 +- + sound/soc/intel/sst-haswell-pcm.c | 4 +- + sound/soc/intel/sst/sst_acpi.c | 10 +- + sound/soc/samsung/i2s.c | 6 +- + sound/usb/mixer_maps.c | 15 +- + sound/usb/mixer_scarlett.c | 2 +- + sound/usb/quirks.c | 5 +- + tools/include/asm-generic/bitops.h | 27 + + tools/include/asm-generic/bitops/__ffs.h | 43 + + tools/include/asm-generic/bitops/__fls.h | 1 + + tools/include/asm-generic/bitops/atomic.h | 22 + + tools/include/asm-generic/bitops/find.h | 33 + + tools/include/asm-generic/bitops/fls.h | 1 + + tools/include/asm-generic/bitops/fls64.h | 1 + + tools/include/linux/bitops.h | 53 + + tools/include/linux/log2.h | 185 ++ + tools/lib/api/fs/fs.c | 34 + + tools/lib/api/fs/fs.h | 3 + + tools/lib/util/find_next_bit.c | 89 + + tools/perf/Documentation/perf.txt | 4 + + tools/perf/MANIFEST | 16 +- + tools/perf/Makefile.perf | 15 +- + tools/perf/bench/mem-memcpy.c | 286 ++- + tools/perf/bench/mem-memset.c | 304 --- + tools/perf/builtin-buildid-cache.c | 13 +- + tools/perf/builtin-kvm.c | 3 +- + tools/perf/builtin-trace.c | 14 +- + tools/perf/perf.c | 14 +- + tools/perf/tests/attr/base-record | 2 +- + tools/perf/tests/attr/base-stat | 2 +- + tools/perf/ui/browsers/hists.c | 2 +- + tools/perf/ui/hist.c | 4 +- + tools/perf/util/build-id.c | 9 +- + tools/perf/util/callchain.c | 2 +- + tools/perf/util/config.c | 10 +- + tools/perf/util/evlist.c | 57 +- + tools/perf/util/evlist.h | 1 + + tools/perf/util/include/linux/bitops.h | 162 -- + tools/perf/util/machine.c | 72 +- + tools/perf/util/record.c | 11 +- + tools/perf/util/srcline.c | 12 +- + tools/perf/util/symbol-minimal.c | 8 +- + tools/perf/util/util.c | 26 +- + tools/perf/util/util.h | 34 +- + tools/power/cpupower/utils/cpuidle-info.c | 8 +- + tools/testing/selftests/Makefile | 17 +- + tools/thermal/tmon/sysfs.c | 6 +- + tools/virtio/Makefile | 2 +- + tools/virtio/linux/virtio.h | 1 + + tools/virtio/linux/virtio_byteorder.h | 8 + + tools/virtio/linux/virtio_config.h | 70 +- + tools/virtio/uapi/linux/virtio_types.h | 1 + + tools/virtio/virtio_test.c | 15 +- + tools/virtio/vringh_test.c | 5 +- + 656 files changed, 20823 insertions(+), 10166 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-dell-laptop + create mode 100644 Documentation/devicetree/bindings/clock/exynos4415-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/exynos7-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/marvell,mmp2.txt + create mode 100644 Documentation/devicetree/bindings/clock/marvell,pxa168.txt + create mode 100644 Documentation/devicetree/bindings/clock/marvell,pxa910.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-opal.txt + create mode 100644 arch/powerpc/include/asm/cpuidle.h + create mode 100644 arch/x86/kernel/apic/htirq.c + create mode 100644 arch/x86/kernel/apic/msi.c + create mode 100644 arch/x86/kernel/apic/vector.c + create mode 100644 drivers/clk/mmp/clk-gate.c + create mode 100644 drivers/clk/mmp/clk-mix.c + create mode 100644 drivers/clk/mmp/clk-of-mmp2.c + create mode 100644 drivers/clk/mmp/clk-of-pxa168.c + create mode 100644 drivers/clk/mmp/clk-of-pxa910.c + create mode 100644 drivers/clk/mmp/clk.c + create mode 100644 drivers/clk/mmp/reset.c + create mode 100644 drivers/clk/mmp/reset.h + create mode 100644 drivers/clk/pxa/clk-pxa25x.c + create mode 100644 drivers/clk/rockchip/clk-mmc-phase.c + create mode 100644 drivers/clk/samsung/clk-exynos4415.c + create mode 100644 drivers/clk/samsung/clk-exynos7.c + create mode 100644 drivers/clk/sunxi/clk-sun9i-core.c + create mode 100644 drivers/i2c/busses/i2c-opal.c + create mode 100644 drivers/infiniband/core/umem_odp.c + create mode 100644 drivers/infiniband/core/umem_rbtree.c + create mode 100644 drivers/infiniband/hw/mlx5/odp.c + delete mode 100644 drivers/macintosh/therm_pm72.c + delete mode 100644 drivers/macintosh/therm_pm72.h + delete mode 100644 drivers/pci/ioapic.c + rename drivers/{ => staging}/media/parport/Kconfig (65%) + rename drivers/{ => staging}/media/parport/Makefile (100%) + rename drivers/{ => staging}/media/parport/bw-qcam.c (100%) + rename drivers/{ => staging}/media/parport/c-qcam.c (100%) + rename drivers/{ => staging}/media/parport/pms.c (100%) + rename drivers/{ => staging}/media/parport/w9966.c (100%) + rename drivers/{media/usb => staging/media}/tlg2300/Kconfig (63%) + rename drivers/{media/usb => staging/media}/tlg2300/Makefile (100%) + rename drivers/{media/usb => staging/media}/tlg2300/pd-alsa.c (100%) + rename drivers/{media/usb => staging/media}/tlg2300/pd-common.h (100%) + rename drivers/{media/usb => staging/media}/tlg2300/pd-dvb.c (100%) + rename drivers/{media/usb => staging/media}/tlg2300/pd-main.c (100%) + rename drivers/{media/usb => staging/media}/tlg2300/pd-radio.c (100%) + rename drivers/{media/usb => staging/media}/tlg2300/pd-video.c (100%) + rename drivers/{media/usb => staging/media}/tlg2300/vendorcmds.h (100%) + create mode 100644 drivers/staging/media/vino/Kconfig + create mode 100644 drivers/staging/media/vino/Makefile + rename drivers/{media/platform => staging/media/vino}/indycam.c (100%) + rename drivers/{media/platform => staging/media/vino}/indycam.h (100%) + rename drivers/{media/i2c => staging/media/vino}/saa7191.c (100%) + rename drivers/{media/i2c => staging/media/vino}/saa7191.h (100%) + rename drivers/{media/platform => staging/media/vino}/vino.c (100%) + rename drivers/{media/platform => staging/media/vino}/vino.h (100%) + create mode 100644 include/dt-bindings/clock/exynos4415.h + create mode 100644 include/dt-bindings/clock/exynos7-clk.h + create mode 100644 include/dt-bindings/clock/marvell,mmp2.h + create mode 100644 include/dt-bindings/clock/marvell,pxa168.h + create mode 100644 include/dt-bindings/clock/marvell,pxa910.h + create mode 100644 include/rdma/ib_umem_odp.h + create mode 100644 include/target/target_core_backend_configfs.h + create mode 100644 tools/include/asm-generic/bitops.h + create mode 100644 tools/include/asm-generic/bitops/__ffs.h + create mode 100644 tools/include/asm-generic/bitops/__fls.h + create mode 100644 tools/include/asm-generic/bitops/atomic.h + create mode 100644 tools/include/asm-generic/bitops/find.h + create mode 100644 tools/include/asm-generic/bitops/fls.h + create mode 100644 tools/include/asm-generic/bitops/fls64.h + create mode 100644 tools/include/linux/bitops.h + create mode 100644 tools/include/linux/log2.h + create mode 100644 tools/lib/util/find_next_bit.c + delete mode 100644 tools/perf/bench/mem-memset.c + delete mode 100644 tools/perf/util/include/linux/bitops.h + create mode 100644 tools/virtio/linux/virtio_byteorder.h + create mode 100644 tools/virtio/uapi/linux/virtio_types.h +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 (f114040e3ea6 Linux 3.18-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 (3f4aa45ceea5 ARM: 8226/1: cacheflush: get rid of restarting block) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (f0b99a643e96 m68k/mm: Eliminate memset after alloc_bootmem_pages) +$ 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 (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging powerpc-merge-mpe/fixes (b2776bf7149b Linux 3.18) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.) +$ git merge sparc/master +Already up-to-date. +Merging net/master (02d6a746c3f0 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/cisco/enic/enic_main.c | 12 ++++++++---- + drivers/net/ethernet/sun/sunvnet.c | 1 + + net/bluetooth/6lowpan.c | 1 - + net/bluetooth/bnep/core.c | 3 +++ + net/bluetooth/cmtp/core.c | 3 +++ + net/bluetooth/hidp/core.c | 3 ++- + 6 files changed, 17 insertions(+), 6 deletions(-) +Merging ipsec/master (f855691975bb xfrm6: Fix the nexthdr offset in _decode_session6.) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv6/xfrm6_policy.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging sound-current/for-linus (d70a1b9893f8 ALSA: usb-audio: extend KEF X300A FU 10 tweak to Arcam rPAC) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (5106787a9e08 PCI: tegra: Use physical range for I/O mapping) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (9a1dce3a0591 rtlwifi: rtl8192ce: Set fw_ready flag) +$ git merge wireless/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (2dbfca5a1819 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (2dbfca5a1819 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (2dbfca5a1819 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (520fe7633692 usb: dwc3: ep0: fix for dead code) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (009d0431c391 Linux 3.18-rc7) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (2dbfca5a1819 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (67e2c3883828 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (6d32af019a45 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Auto-merging drivers/mfd/stmpe.h +Auto-merging drivers/mfd/stmpe.c +Auto-merging drivers/input/touchscreen/edt-ft5x06.c +Auto-merging drivers/input/keyboard/gpio_keys.c +Auto-merging drivers/input/evdev.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/gpio-keys.txt | 10 +- + .../devicetree/bindings/input/stmpe-keypad.txt | 2 + + drivers/input/evdev.c | 60 ++++++--- + drivers/input/input.c | 22 ++-- + drivers/input/keyboard/Kconfig | 1 + + drivers/input/keyboard/gpio_keys.c | 114 ++++++++--------- + drivers/input/keyboard/stmpe-keypad.c | 141 ++++++++++++--------- + drivers/input/mouse/alps.c | 84 ++++++++++-- + drivers/input/mouse/trackpoint.c | 4 + + drivers/input/mouse/trackpoint.h | 5 + + drivers/input/touchscreen/edt-ft5x06.c | 4 +- + drivers/mfd/stmpe.c | 4 + + drivers/mfd/stmpe.h | 3 + + include/linux/mfd/stmpe.h | 22 +--- + 14 files changed, 299 insertions(+), 177 deletions(-) +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 (8606813a6c89 crypto: tcrypt - Allow speed testing of arbitrary hash functions) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (094cb98179f1 of/fdt: memblock_reserve /memreserve/ regions in the case of partial overlap) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (3438cf549d2f param: fix crash on bad kernel arguments) +$ 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 (3ce51050fadd selftest: size: Add size test for Linux kernel) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (b0616c5306b3 drm/i915: Unlock panel even when LVDS is disabled) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (cb61f6769b88 ARM64: use GENERIC_PCI_IOMAP) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (7a70bf797a58 ARC: rename default defconfig) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (e9f2d6d66037 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Already up-to-date. +Merging arm-perf/for-next/perf (cac7f2429872 Linux 3.18-rc2) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (d6ad36913083 clocksource: arch_timer: Only use the virtual counter (CNTVCT) on arm64) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + drivers/clocksource/arm_arch_timer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (91bcb334bf0b Merge branch 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (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 (8a73e870fc56 Merge tag 'imx-dt-3.19' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ixp4xx/next (19f949f52599 Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +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 (9993917cbc99 Merge branch 'mvebu/dt-usb_phy' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging renesas/next (f180b3e0dbd9 Merge branch 'heads/soc-fixes-for-v3.19' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/mach-shmobile/setup-r8a7740.c | 7 +++++++ + 1 file changed, 7 insertions(+) +Merging samsung/for-next (9db7d78aca2c Merge branch 'v3.19-next/dt-samsung-3' into for-next) +$ git merge samsung/for-next +Resolved 'arch/arm64/Kconfig' using previous resolution. +Auto-merging arch/arm64/boot/dts/Makefile +Auto-merging arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Auto-merging arch/arm/configs/exynos_defconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1c6ef24027f3] Merge remote-tracking branch 'samsung/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/samsung/pmu.txt | 1 + + arch/arm/configs/exynos_defconfig | 3 +- + arch/arm/plat-samsung/cpu.c | 4 + + arch/arm64/Kconfig | 17 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/exynos/Makefile | 5 + + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 84 +++ + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 588 +++++++++++++++++++++ + arch/arm64/boot/dts/exynos/exynos7.dtsi | 530 +++++++++++++++++++ + 9 files changed, 1232 insertions(+), 1 deletion(-) + create mode 100644 arch/arm64/boot/dts/exynos/Makefile + create mode 100644 arch/arm64/boot/dts/exynos/exynos7-espresso.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos7.dtsi +Merging sunxi/sunxi/for-next (ad01dbad5626 Merge branch 'sunxi/clocks-for-3.19' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. +Merging tegra/for-next (fa047e01365d Merge branch for-3.19/soc into for-next) +$ git merge tegra/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (fb59d007a0e4 arm64: mm: dump: don't skip final region) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) +$ git merge blackfin/for-linus +Merge made by the 'recursive' strategy. + arch/blackfin/configs/BF518F-EZBRD_defconfig | 1 - + arch/blackfin/configs/BF527-TLL6527M_defconfig | 1 - + arch/blackfin/configs/BF533-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF533-STAMP_defconfig | 1 - + arch/blackfin/configs/BF537-STAMP_defconfig | 3 ++- + arch/blackfin/configs/BF538-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF561-ACVILON_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT_defconfig | 1 - + arch/blackfin/configs/CM-BF527_defconfig | 1 - + arch/blackfin/configs/CM-BF533_defconfig | 1 - + arch/blackfin/configs/CM-BF537E_defconfig | 1 - + arch/blackfin/configs/CM-BF537U_defconfig | 1 - + arch/blackfin/configs/CM-BF548_defconfig | 1 - + arch/blackfin/configs/CM-BF561_defconfig | 1 - + arch/blackfin/configs/DNP5370_defconfig | 1 - + arch/blackfin/configs/IP0X_defconfig | 1 - + arch/blackfin/configs/PNAV-10_defconfig | 1 - + arch/blackfin/configs/SRV1_defconfig | 1 - + arch/blackfin/configs/TCM-BF518_defconfig | 1 - + arch/blackfin/configs/TCM-BF537_defconfig | 1 - + arch/blackfin/kernel/kgdb.c | 12 ++++-------- + arch/blackfin/mach-bf609/boards/ezkit.c | 8 ++++---- + 23 files changed, 10 insertions(+), 33 deletions(-) +Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (21bd887cd7c4 CRISv32: Remove last remnants of ETRAX_SPI_MMC_BOARD) +$ git merge cris/for-next +Merge made by the 'recursive' strategy. +Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (0fd2468fd035 Merge branch 'misc-3.19' into next) +$ git merge ia64/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging m68k/for-next (f0b99a643e96 m68k/mm: Eliminate memset after alloc_bootmem_pages) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (0259650b4cf7 m68knommu: fix irq handler types in 68360/commproc.c) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/68360/commproc.c | 8 ++++---- + arch/m68k/include/asm/commproc.h | 24 +----------------------- + 2 files changed, 5 insertions(+), 27 deletions(-) +Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (3a8e3265179b microblaze: Fix mmap for cache coherent memory) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (28320df4899b Merge branch '3.19-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 21 ++++++++---------- + arch/mips/configs/malta_defconfig | 16 ++++---------- + arch/mips/include/asm/checksum.h | 40 ++++++++++++---------------------- + arch/mips/include/asm/fpu.h | 43 ++++++++++++++++++++++--------------- + arch/mips/include/uapi/asm/unistd.h | 15 +++++++------ + arch/mips/jz4740/irq.c | 3 +++ + arch/mips/kernel/scall32-o32.S | 1 + + arch/mips/kernel/scall64-64.S | 1 + + arch/mips/kernel/scall64-n32.S | 1 + + arch/mips/kernel/scall64-o32.S | 1 + + 10 files changed, 69 insertions(+), 73 deletions(-) +Merging nios2/nios2-next (f1f2eac9124b nios2/uaccess: fix sparse errors) +$ git merge nios2/nios2-next +Already up-to-date. +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 (aa47b141a43a parisc: fix out-of-register compiler error in ldcw inline assembler function) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/ldcw.h | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) +Merging powerpc/next (d557b09800da powerpc/mm/thp: Use tlbiel if possible) +$ git merge powerpc/next +Already up-to-date. +Merging powerpc-mpe/next (d70a54e2d085 powerpc/powernv: Ignore smt-enabled on Power8 and later) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (76f3e2929bb6 powerpc/config: Enable memory driver) +$ 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 (fa0d0b064d55 s390/signal: add sys_sigreturn and sys_rt_sigreturn declarations) +$ git merge s390/features +Auto-merging arch/s390/mm/pgtable.c +Merge made by the 'recursive' strategy. + arch/s390/kernel/dis.c | 1 - + arch/s390/kernel/entry.h | 4 +- + arch/s390/kernel/ftrace.c | 95 +++++++++++++++++++++++--------------------- + arch/s390/kernel/vtime.c | 2 - + arch/s390/mm/pgtable.c | 6 +-- + arch/s390/pci/pci_mmio.c | 4 +- + drivers/s390/crypto/ap_bus.c | 10 +++-- + 7 files changed, 64 insertions(+), 58 deletions(-) +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (c47b15c4928c arch/tile: update MAINTAINERS email to EZchip) +$ 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/um_arch.c +Auto-merging arch/um/kernel/trap.c +Auto-merging arch/um/kernel/ptrace.c +Removing arch/um/include/shared/skas_ptrace.h +Removing arch/um/include/shared/skas/proc_mm.h +Auto-merging arch/um/include/shared/os.h +Auto-merging arch/um/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8cbb5770adcc] 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 (1f2fdbd0078c xtensa: disable link optimization) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (1edb647bb954 Btrfs: remove non-sense btrfs_error_discard_extent() function) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default) +$ git merge ceph/master +Resolved 'fs/ceph/snap.c' using previous resolution. +Resolved 'fs/ceph/super.c' using previous resolution. +Resolved 'fs/ceph/super.h' using previous resolution. +Resolved 'net/ceph/auth_x.c' using previous resolution. +Auto-merging net/ceph/auth_x.c +CONFLICT (content): Merge conflict in net/ceph/auth_x.c +Auto-merging fs/ceph/super.h +CONFLICT (content): Merge conflict in fs/ceph/super.h +Auto-merging fs/ceph/super.c +CONFLICT (content): Merge conflict in fs/ceph/super.c +Auto-merging fs/ceph/snap.c +CONFLICT (content): Merge conflict in fs/ceph/snap.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 83f6941fde77] Merge remote-tracking branch 'ceph/master' +$ git diff -M --stat --summary HEAD^.. +Merging cifs/for-next (e44cac3a7848 [SMB31] Initialize salt value for negotiate context) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 9 +++++++ + fs/cifs/cifsglob.h | 13 +++++++--- + fs/cifs/connect.c | 10 ++++++++ + fs/cifs/netmisc.c | 12 ++++++---- + fs/cifs/smb2misc.c | 12 ++++++---- + fs/cifs/smb2ops.c | 25 ++++++++++++++++++- + fs/cifs/smb2pdu.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++--- + fs/cifs/smb2pdu.h | 52 +++++++++++++++++++++++++++++++++------- + fs/cifs/smb2transport.c | 2 +- + 9 files changed, 172 insertions(+), 27 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 (942080643bce eCryptfs: Remove buggy and unnecessary write in file name decode routine) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (f54e18f1b831 isofs: Fix infinite looping over CE entries) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (50db71abc529 ext4: ext4_da_convert_inline_data_to_extent drop locked page after error) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (635aee1fefef f2fs: avoid to ra unneeded blocks in recover flow) +$ 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 1a4c255fbbd9] Merge remote-tracking branch 'fscache/fscache' +$ git diff -M --stat --summary HEAD^.. +Merging fuse/for-next (1c68271cf1bf fuse: use file_inode() in fuse_file_fallocate()) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (ec7d879c4576 GFS2: gfs2_atomic_open(): simplify the use of finish_no_open()) +$ git merge gfs2/master +Already up-to-date. +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 (388f0c776781 sunrpc: add a debugfs rpc_xprt directory with an info file in it) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (3c0aeb6da065 nfsd: fi_delegees doesn't need to be an atomic_t) +$ git merge nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4state.c +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4state.c | 8 ++++---- + fs/nfsd/state.h | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (2b7a8f36f092 ovl: add testsuite to docs) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/readdir.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.txt | 24 ++ + fs/overlayfs/copy_up.c | 5 +- + fs/overlayfs/dir.c | 28 +- + fs/overlayfs/inode.c | 12 +- + fs/overlayfs/overlayfs.h | 18 +- + fs/overlayfs/readdir.c | 145 ++++----- + fs/overlayfs/super.c | 546 +++++++++++++++++++++----------- + 7 files changed, 482 insertions(+), 296 deletions(-) +Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (f38aed975c0c UBI: Fix invalid vfree()) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (6044e4386cd5 Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (1b2b32dcdb3d locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (e3bb504efd91 [regression] chunk lost from bd9b51) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (149792795d2b Merge branch 'pci/msi' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (b104d8ba2a44 Merge branch 'for-3.20/logitech' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-core.c | 22 ++++++++--- + drivers/hid/hid-lenovo.c | 79 ++++++++++++++++++++++++++++++++++++- + drivers/hid/hid-logitech-hidpp.c | 84 +++++++++++++++++++++++++++++++++------- + include/linux/hid.h | 4 +- + 4 files changed, 167 insertions(+), 22 deletions(-) +Merging i2c/i2c/for-next (fe07adec730d i2c: sh_mobile: fix uninitialized var when debug is enabled) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (ae530d4403e9 hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro) +$ git merge jdelvare-hwmon/master +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/hwmon/Kconfig +Merge made by the 'recursive' strategy. + drivers/hwmon/Kconfig | 10 +++ + drivers/hwmon/Makefile | 1 + + drivers/hwmon/i5500_temp.c | 149 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 160 insertions(+) + create mode 100644 drivers/hwmon/i5500_temp.c +Merging hwmon-staging/hwmon-next (907a6d582459 hwmon: (tmp401) Detect TMP435 on all addresses it supports) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (2ea3258b238c Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (657eeca39128 Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/gcov/Kconfig +Auto-merging init/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++++ + Makefile | 19 +++++- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 ++++++++++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.lto | 84 +++++++++++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/link-vmlinux.sh | 2 +- + 9 files changed, 356 insertions(+), 8 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto +Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (d325a876e2b3 Merge branch 'for-3.18-fixes' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (464ed18ebdb6 PM: Eliminate CONFIG_PM_RUNTIME) +$ git merge pm/linux-next +Already up-to-date. +Merging idle/next (f7c0e22f2d14 Merge branch 'turbostat' into release) +$ git merge idle/next +Recorded preimage for 'arch/x86/include/uapi/asm/msr-index.h' +Auto-merging drivers/cpufreq/Makefile +Auto-merging drivers/acpi/processor_idle.c +Auto-merging arch/x86/include/uapi/asm/msr-index.h +CONFLICT (content): Merge conflict in arch/x86/include/uapi/asm/msr-index.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/include/uapi/asm/msr-index.h'. +[master 8b8d6c47261a] Merge remote-tracking branch 'idle/next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/uapi/asm/msr-index.h | 5 + + drivers/acpi/processor_idle.c | 2 - + drivers/cpufreq/Kconfig.x86 | 10 ++ + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/sfi-cpufreq.c | 136 ++++++++++++++++++++++++++ + drivers/cpuidle/governors/ladder.c | 7 +- + drivers/cpuidle/governors/menu.c | 25 ++--- + drivers/sfi/sfi_core.c | 4 +- + include/linux/cpuidle.h | 3 - + tools/power/x86/turbostat/turbostat.c | 179 +++++++++++++++++++++++++++++++--- + 10 files changed, 332 insertions(+), 40 deletions(-) + create mode 100644 drivers/cpufreq/sfi-cpufreq.c +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 (2707dbd09a85 Merge branches 'thermal-core-fix', 'thermal-soc' and 'thermal-int340x' into next) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (d8c3cd75e77d Merge branch 'work-fixes' into work-next) +$ git merge thermal-soc/next +Auto-merging include/linux/thermal.h +Auto-merging drivers/thermal/thermal_core.c +Auto-merging drivers/thermal/samsung/exynos_tmu.c +Auto-merging drivers/thermal/imx_thermal.c +Auto-merging drivers/thermal/db8500_cpufreq_cooling.c +Merge made by the 'recursive' strategy. + drivers/thermal/cpu_cooling.c | 359 ++++++++------------- + drivers/thermal/db8500_cpufreq_cooling.c | 20 +- + drivers/thermal/imx_thermal.c | 15 +- + drivers/thermal/samsung/Kconfig | 2 +- + drivers/thermal/samsung/exynos_thermal_common.c | 12 +- + drivers/thermal/samsung/exynos_tmu.c | 5 +- + drivers/thermal/thermal_core.c | 6 +- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 17 +- + include/dt-bindings/thermal/thermal.h | 2 +- + include/linux/cpu_cooling.h | 6 +- + include/linux/thermal.h | 2 +- + 11 files changed, 177 insertions(+), 269 deletions(-) +Merging ieee1394/for-next (d737d7da8e7e firewire: sbp2: replace card lock by target lock) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (9a0a47f5e620 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. +Merging net-next/master (f96fe225677b 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 (fbe68ee87522 vti6: Add a lookup method for tunnels with wildcard endpoints.) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-next/master (81c412600f94 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless) +$ git merge wireless-next/master +Already up-to-date. +Merging bluetooth/master (72e4a6bd0220 Bluetooth: Remove duplicate constant for RFCOMM PSM) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btusb.c | 28 + + drivers/net/ieee802154/at86rf230.c | 80 +- + drivers/net/ieee802154/cc2520.c | 2 - + drivers/net/ieee802154/mrf24j40.c | 6 +- + include/net/bluetooth/hci.h | 43 + + include/net/bluetooth/hci_core.h | 35 +- + include/net/bluetooth/l2cap.h | 1 + + include/net/bluetooth/rfcomm.h | 2 - + include/net/cfg802154.h | 10 +- + include/net/ieee802154_netdev.h | 4 +- + include/net/mac802154.h | 5 +- + include/net/nl802154.h | 45 +- + net/bluetooth/Makefile | 2 +- + net/bluetooth/hci_conn.c | 4 + + net/bluetooth/hci_core.c | 1628 +----------------------------------- + net/bluetooth/hci_debugfs.c | 1076 ++++++++++++++++++++++++ + net/bluetooth/hci_debugfs.h | 26 + + net/bluetooth/hci_event.c | 71 +- + net/bluetooth/hci_request.c | 555 ++++++++++++ + net/bluetooth/hci_request.h | 54 ++ + net/bluetooth/mgmt.c | 265 ++++-- + net/bluetooth/rfcomm/core.c | 4 +- + net/ieee802154/nl-mac.c | 4 +- + net/ieee802154/nl802154.c | 46 +- + net/ieee802154/rdev-ops.h | 7 + + net/ieee802154/sysfs.c | 2 +- + net/mac802154/cfg.c | 21 + + net/mac802154/driver-ops.h | 5 +- + net/mac802154/iface.c | 100 ++- + net/mac802154/mac_cmd.c | 6 +- + 30 files changed, 2383 insertions(+), 1754 deletions(-) + create mode 100644 net/bluetooth/hci_debugfs.c + create mode 100644 net/bluetooth/hci_debugfs.h + create mode 100644 net/bluetooth/hci_request.c + create mode 100644 net/bluetooth/hci_request.h +Merging infiniband/for-next (a7cfef21e3d0 Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'mlx4', 'ocrdma', 'odp' and 'srp' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (d6666be6f0c4 Merge tag 'for-linus-20141215' of git://git.infradead.org/linux-mtd) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (68f29815034e mtd: tests: abort torturetest on erase errors) +$ git merge l2-mtd/master +Already up-to-date. +Merging crypto/master (8606813a6c89 crypto: tcrypt - Allow speed testing of arbitrary hash functions) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (4e0cd6811562 drm: sti: fix module compilation issue) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (54cbc4e298ea drm/mipi-dsi: Avoid potential NULL pointer dereference) +$ git merge drm-panel/drm/panel/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_mipi_dsi.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging drm-intel/for-linux-next (5d77d9c5e177 drm/i915: add missing rpm ref to i915_gem_pwrite_ioctl) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_drv.c | 4 ++- + drivers/gpu/drm/i915/i915_drv.h | 2 -- + drivers/gpu/drm/i915/i915_gem.c | 8 +++++- + drivers/gpu/drm/i915/i915_gem_context.c | 48 +++++++++++++++++++++++++++------ + drivers/gpu/drm/i915/i915_irq.c | 24 +++++++++++------ + drivers/gpu/drm/i915/i915_reg.h | 3 +++ + drivers/gpu/drm/i915/intel_display.c | 8 +----- + drivers/gpu/drm/i915/intel_pm.c | 28 ++++++++++++------- + drivers/gpu/drm/i915/intel_ringbuffer.c | 3 +++ + drivers/gpu/drm/i915/intel_runtime_pm.c | 27 ------------------- + 10 files changed, 92 insertions(+), 63 deletions(-) +Merging drm-tegra/drm/tegra/for-next (7e0180e3570c drm/tegra: gem: Check before freeing CMA memory) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/core-stuff (6cadd306033e drm/fb-helper: Propagate errors from initial config failure) +$ git merge drm-misc/topic/core-stuff +Auto-merging include/drm/drm_fb_helper.h +Auto-merging include/drm/drm_crtc.h +Auto-merging drivers/gpu/drm/tegra/dc.c +Auto-merging drivers/gpu/drm/sti/sti_drm_crtc.c +Auto-merging drivers/gpu/drm/radeon/radeon_fb.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Auto-merging Documentation/DocBook/drm.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 3 +- + drivers/gpu/drm/armada/armada_crtc.c | 5 -- + drivers/gpu/drm/ast/ast_fb.c | 21 +++++-- + drivers/gpu/drm/bochs/bochs_fbdev.c | 14 ++++- + drivers/gpu/drm/bochs/bochs_kms.c | 5 -- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 12 ++-- + drivers/gpu/drm/drm_cache.c | 13 ++-- + drivers/gpu/drm/drm_crtc.c | 103 ++++++++++++++++--------------- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/drm_info.c | 24 ------- + drivers/gpu/drm/drm_internal.h | 1 - + drivers/gpu/drm/drm_irq.c | 11 ++-- + drivers/gpu/drm/drm_modes.c | 56 +++++++++++++---- + drivers/gpu/drm/drm_plane_helper.c | 16 +++-- + drivers/gpu/drm/drm_probe_helper.c | 43 +++++++------ + drivers/gpu/drm/gma500/framebuffer.c | 22 +++++-- + drivers/gpu/drm/mgag200/mgag200_fb.c | 12 +++- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 5 -- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 5 -- + drivers/gpu/drm/msm/msm_fbdev.c | 10 ++- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 21 +++++-- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 10 ++- + drivers/gpu/drm/qxl/qxl_fb.c | 22 +++++-- + drivers/gpu/drm/radeon/radeon_fb.c | 21 +++++-- + drivers/gpu/drm/sti/sti_drm_crtc.c | 6 -- + drivers/gpu/drm/tegra/dc.c | 5 -- + drivers/gpu/drm/udl/udl_fb.c | 22 ++++--- + include/drm/drmP.h | 4 +- + include/drm/drm_crtc.h | 2 +- + include/drm/drm_crtc_helper.h | 32 ++++++++-- + include/drm/drm_fb_helper.h | 2 +- + include/drm/drm_modes.h | 6 +- + include/uapi/drm/drm_mode.h | 8 +-- + 33 files changed, 319 insertions(+), 225 deletions(-) +Merging sound/for-next (d70a1b9893f8 ALSA: usb-audio: extend KEF X300A FU 10 tweak to Arcam rPAC) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (1affeb608ed9 Merge remote-tracking branches 'asoc/topic/dwc' and 'asoc/topic/wm8750' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + sound/soc/codecs/wm8750.c | 2 +- + sound/soc/dwc/designware_i2s.c | 13 ++----------- + sound/soc/soc-core.c | 14 +++++--------- + 3 files changed, 8 insertions(+), 21 deletions(-) +Merging modules/modules-next (b0a65b0cccd4 param: do not set store func without write perm) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (c91c2a63913b mic/host: initial virtio 1.0 support) +$ git merge virtio/virtio-next +Resolved 'drivers/virtio/virtio_pci_common.c' using previous resolution. +Auto-merging drivers/virtio/virtio_pci_common.c +CONFLICT (content): Merge conflict in drivers/virtio/virtio_pci_common.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fbebc67afe9d] Merge remote-tracking branch 'virtio/virtio-next' +$ git diff -M --stat --summary HEAD^.. + drivers/virtio/virtio_pci_common.c | 5 ----- + 1 file changed, 5 deletions(-) +Merging input/next (dd9ce1902bbb Input: add regulator haptic driver) +$ git merge input/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/regulator-haptic.txt | 21 ++ + drivers/input/misc/Kconfig | 11 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/regulator-haptic.c | 279 +++++++++++++++++++++ + include/linux/platform_data/regulator-haptic.h | 29 +++ + 5 files changed, 341 insertions(+) + create mode 100644 Documentation/devicetree/bindings/input/regulator-haptic.txt + create mode 100644 drivers/input/misc/regulator-haptic.c + create mode 100644 include/linux/platform_data/regulator-haptic.h +Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) +$ git merge input-mt/for-next +Already up-to-date. +Merging block/for-next (e248d2ba0082 Merge branch 'for-3.19/drivers' into for-next) +$ git merge block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (5164bece1673 dm: fix missed error code if .end_io isn't implemented by target_type) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-thin.c | 29 +++++++++++++++++++++++------ + drivers/md/dm.c | 2 +- + 2 files changed, 24 insertions(+), 7 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 (d790be3863b2 Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux) +$ git merge mmc-uh/next +Already up-to-date. +Merging kgdb/kgdb-next (0f16996cf2ed kernel/debug/debug_core.c: Logging clean-up) +$ git merge kgdb/kgdb-next +Auto-merging kernel/trace/trace_kdb.c +Merge made by the 'recursive' strategy. + include/linux/kdb.h | 62 ++++++++-- + kernel/debug/debug_core.c | 52 ++++---- + kernel/debug/kdb/kdb_bp.c | 37 +++--- + kernel/debug/kdb/kdb_debugger.c | 4 + + kernel/debug/kdb/kdb_main.c | 267 +++++++++++++++++++++++++--------------- + kernel/debug/kdb/kdb_private.h | 3 +- + kernel/trace/trace_kdb.c | 4 +- + lib/Kconfig.kgdb | 25 ++++ + 8 files changed, 306 insertions(+), 148 deletions(-) +Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (f851b60db0fd md: Check MD_RECOVERY_RUNNING as well as ->sync_thread.) +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-mfd-next (a3b63979f8a3 mfd: rtsx: Add func to split u32 into register) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (3d6969a641d0 MAINTAINERS: Remove my name from Backlight subsystem) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (02088e3ed79f power: reset: augment versatile driver for integrator) +$ git merge battery/master +Merge made by the 'recursive' strategy. + drivers/power/reset/arm-versatile-reboot.c | 32 +++++++++++++++++++++++++++--- + 1 file changed, 29 insertions(+), 3 deletions(-) +Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) +$ git merge fbdev/for-next +Already up-to-date. +Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (574d54112fda Merge branches '3.19/omapdss' and '3.19/simplefb' into for-next) +$ git merge omap_dss2/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging regulator/for-next (1b475231d95e Merge remote-tracking branch 'regulator/topic/rk808' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/rk808-regulator.c | 6 +++--- + drivers/regulator/s2mps11.c | 19 ++++++++++++------- + 2 files changed, 15 insertions(+), 10 deletions(-) +Merging security/next (b2d1965dcea1 Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next) +$ git merge security/next +Already up-to-date. +Merging integrity/next (63a0eb7891bd ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met) +$ git merge integrity/next +Already up-to-date. +Merging selinux/next (00fec2a10b51 selinux: Remove security_ops extern) +$ 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 (2193e69bf650 watchdog: imx2_wdt: Fix the argument of watchdog_active()) +$ git merge watchdog/master +Auto-merging drivers/watchdog/imx2_wdt.c +CONFLICT (content): Merge conflict in drivers/watchdog/imx2_wdt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/watchdog/imx2_wdt.c'. +[master dc91bd5f57fc] Merge remote-tracking branch 'watchdog/master' +$ git diff -M --stat --summary HEAD^.. +Merging iommu/next (76771c938e95 Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (1860e379875d Linux 3.15) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (5e9f36c59a48 drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (9b64c09bb960 kobject: grammar fix) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (078014dd3698 intel_ips: fix a type in error message) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (0288d7183c41 audit: convert status version to a feature bitmap) +$ git merge audit/next +Already up-to-date. +Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (c46ca3c8310b of: Delete unnecessary check before calling "of_node_put()") +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (a0e27f51ba8a documentation: pinctrl bindings: Fix trivial typo 'abitrary') +$ git merge dt-rh/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (bcfc4f40182c Merge remote-tracking branches 'spi/topic/falcon' and 'spi/topic/inline' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/spi-falcon.c | 12 ----- + drivers/spi/spi-sh-msiof.c | 5 ++ + drivers/spi/spi.c | 114 ++++++++++++++++++++++++++++++++++++--------- + include/linux/spi/spi.h | 2 + + 4 files changed, 100 insertions(+), 33 deletions(-) +Merging tip/auto-latest (aa0f6b220f8a Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging arch/x86/include/uapi/asm/msr-index.h +Auto-merging arch/x86/include/asm/cpufeature.h +Merge made by the 'recursive' strategy. + arch/x86/include/asm/cpufeature.h | 2 ++ + arch/x86/include/asm/debugreg.h | 5 +++ + arch/x86/include/asm/hw_breakpoint.h | 1 + + arch/x86/include/uapi/asm/msr-index.h | 4 +++ + arch/x86/kernel/cpu/amd.c | 19 +++++++++++ + arch/x86/kernel/hw_breakpoint.c | 45 ++++++++++--------------- + tools/perf/Documentation/perf-record.txt | 7 ++-- + tools/perf/tests/parse-events.c | 58 ++++++++++++++++++++++++++++++++ + tools/perf/util/parse-events.c | 21 ++++++------ + tools/perf/util/parse-events.h | 2 +- + tools/perf/util/parse-events.l | 1 + + tools/perf/util/parse-events.y | 26 ++++++++++++-- + 12 files changed, 148 insertions(+), 43 deletions(-) +Merging clockevents/clockevents/next (b0ad5917960c ARM/ARM64: arch-timer: fix arch_timer_probed logic) +$ git merge clockevents/clockevents/next +Merge made by the 'recursive' strategy. +Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (50872ccd8786 EDAC, MCE, AMD: Correct formatting of decoded text) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (5cc8f658723f Merge branch 'irqchip/irqdomain-arm' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge tiny/tiny/next +Already up-to-date. +Merging ftrace/for-next (0daa2302968c tracing: Add tp_printk cmdline to have tracepoints go to printk()) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (3cd05fcfa269 Merge tag 'v3.18-rc6' into HEAD) +$ git merge rcu/rcu/next +Already up-to-date! +Merge made by the 'recursive' strategy. +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 (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (05971120fca4 arm/arm64: KVM: Require in-kernel vgic for the arch timers) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (476ce5ef09b2 KVM: PPC: Book3S: Enable in-kernel XICS emulation by default) +$ 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 (2e917175e1ef xen: Speed up set_phys_to_machine() by using read-only mappings) +$ git merge xen-tip/linux-next +Already up-to-date. +$ git am -3 ../patches/0001-arm-introduce-is_device_dma_coherent-merge-fix.patch +Applying: arm: introduce is_device_dma_coherent merge fix +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm/mm/dma-mapping.c +$ git add -A . +$ git commit -v -a --amend +[master e7929b6c0bd5] Merge remote-tracking branch 'rcu/rcu/next' + Date: Sun Dec 21 19:15:40 2014 +1100 +Merging percpu/for-next (bfaa047a9415 Merge branch 'for-3.18-fixes' into for-next) +$ git merge percpu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (008847f66c38 workqueue: allow rescuer thread to do more work.) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/for-next (200db647112d platform/x86/acerhdf: Still depends on THERMAL) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (270ded427d7b Merge remote-tracking branch 'regmap/topic/core' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/internal.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging hsi/for-next (d95dc9e38810 HSI: nokia-modem: fix error handling of irq_of_parse_and_map) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (2969bb18f889 leds: lp8860: Fix module dependency) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (98e0721c20db ipmi: Fix compile issue with isspace()) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 46 ++++++++++++++----------------------- + drivers/char/ipmi/ipmi_ssif.c | 1 + + 2 files changed, 18 insertions(+), 29 deletions(-) +Merging driver-core/driver-core-next (2dbfca5a1819 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (2dbfca5a1819 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (2dbfca5a1819 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (ebf3992061db usb: musb: Use IS_ENABLED for tusb6010) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (e7181d005e84 USB: qcserial: Add support for HP lt4112 LTE/HSPA+ Gobi 4G Modem) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging staging/staging-next (2dbfca5a1819 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (67e2c3883828 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging cgroup/for-next (eeecbd197151 cgroup: implement cgroup_get_e_css()) +$ git merge cgroup/for-next +Already up-to-date. +Merging scsi/for-next (49f096fcbaec Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-next) +$ git merge scsi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging target-updates/for-next (ae450e246e85 target: Allow AllRegistrants to re-RESERVE existing reservation) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (96dfdff694ae pinctrl: rockchip: Fix enable/disable/mask/unmask) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/pinctrl-rockchip.c | 57 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 54 insertions(+), 3 deletions(-) +Merging vhost/linux-next (5ff16110c637 virtio_pci: restore module attributes) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (170680abd1eb gpio: mcp23s08: fix up compilation error) +$ git merge gpio/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (39e046f2c1dd pwm: atmel-hlcdc: add at91sam9x5 and sama5d3 errata handling) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning) +$ git merge dma-buf/for-next +Merge made by the 'recursive' strategy. +Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (17150fef4ab1 ktest: Add back "tail -1" to kernelrelease make) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (f1e9203e2366 clk: samsung: Fix Exynos 5420 pinctrl setup and clock disable failure due to domain being gated) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) +$ git merge random/dev +Already up-to-date. +Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +Auto-merging lib/lzo/lzo1x_decompress_safe.c +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0) +$ git merge aio/master +Already up-to-date. +Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. +Merging documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-utils URL) +$ git merge documentation/for-next +Already up-to-date. +Merging kselftest/next (0df1f2487d2f Linux 3.18-rc3) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (45446a99cef6 staging: media: lirc: Replace timeval with ktime_t in lirc_parallel.c) +$ git merge y2038/y2038 +Resolved 'drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c' using previous resolution. +Resolved 'drivers/staging/ft1000/ft1000-usb/ft1000_debug.c' using previous resolution. +Resolved 'drivers/staging/media/lirc/lirc_sasem.c' using previous resolution. +Auto-merging kernel/cpuset.c +Auto-merging drivers/staging/media/lirc/lirc_serial.c +Auto-merging drivers/staging/media/lirc/lirc_sasem.c +CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/staging/media/lirc/lirc_parallel.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 273334fec37b] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 6 +-- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 6 +-- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 6 +-- + drivers/staging/ft1000/ft1000.h | 4 +- + drivers/staging/gdm72xx/gdm_sdio.c | 13 +++--- + drivers/staging/gdm72xx/gdm_sdio.h | 4 +- + drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++---------- + drivers/staging/media/lirc/lirc_sasem.c | 20 +++++----- + drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++---------------- + kernel/cpuset.c | 12 ++++-- + 10 files changed, 69 insertions(+), 87 deletions(-) +Merging luto-misc/next (6ce4436c9cbe Merge tag 'please-pull-morepstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux) +$ git merge luto-misc/next +Already up-to-date. +Merging access_once/linux-next (5de72a2247ac s390/kvm: REPLACE barrier fixup with READ_ONCE) +$ git merge access_once/linux-next +Already up-to-date. +$ git am -3 ../patches/0001-x86-xen-p2m-Replace-ACCESS_ONCE-with-READ_ONCE.patch +Applying: x86/xen/p2m: Replace ACCESS_ONCE with READ_ONCE +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/xen/p2m.c +$ git add -A . +$ git commit -v -a --amend +[master 304c4be2cb0a] Merge remote-tracking branch 'y2038/y2038' + Date: Sun Dec 21 19:24:00 2014 +1100 +Merging akpm-current/current (350b61c87ab5 metag: Align thread_info::supervisor_stack) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'fs/ocfs2/aops.c' +Auto-merging mm/rmap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/memory.c +Auto-merging mm/madvise.c +Auto-merging mm/huge_memory.c +CONFLICT (modify/delete): mm/fremap.c deleted in akpm-current/current and modified in HEAD. Version HEAD of mm/fremap.c left in tree. +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/linux/fs.h +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/dlm/dlmmaster.c +Auto-merging fs/ocfs2/aops.c +CONFLICT (content): Merge conflict in fs/ocfs2/aops.c +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/input/input.c +Auto-merging arch/xtensa/include/uapi/asm/mman.h +Auto-merging arch/x86/kernel/machine_kexec_64.c +Auto-merging arch/tile/kernel/signal.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f mm/fremap.c +mm/fremap.c: needs merge +rm 'mm/fremap.c' +$ git commit -v -a +Recorded resolution for 'fs/ocfs2/aops.c'. +[master 1295be53c728] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/i2c/trivial-devices.txt | 2 +- + Documentation/filesystems/vfat.txt | 10 + + Documentation/leds/leds-class.txt | 3 - + Documentation/printk-formats.txt | 6 + + Documentation/vm/remap_file_pages.txt | 7 +- + arch/alpha/include/asm/thread_info.h | 5 - + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/alpha/kernel/signal.c | 2 +- + arch/arc/include/asm/thread_info.h | 4 - + arch/arc/kernel/signal.c | 2 +- + arch/arm/include/asm/pgtable-3level.h | 1 + + arch/arm/include/asm/thread_info.h | 4 - + arch/arm/kernel/signal.c | 4 +- + arch/arm64/include/asm/pgtable.h | 2 + + arch/arm64/include/asm/thread_info.h | 4 - + arch/arm64/kernel/signal.c | 2 +- + arch/arm64/kernel/signal32.c | 4 +- + arch/avr32/include/asm/thread_info.h | 4 - + arch/avr32/kernel/asm-offsets.c | 1 - + arch/avr32/kernel/signal.c | 2 +- + arch/blackfin/include/asm/thread_info.h | 4 - + arch/blackfin/kernel/signal.c | 2 +- + arch/c6x/include/asm/thread_info.h | 4 - + arch/c6x/kernel/signal.c | 2 +- + arch/cris/arch-v10/kernel/signal.c | 2 +- + arch/cris/arch-v32/kernel/signal.c | 2 +- + arch/cris/include/asm/thread_info.h | 4 - + arch/frv/include/asm/thread_info.h | 4 - + arch/frv/kernel/asm-offsets.c | 1 - + arch/frv/kernel/signal.c | 2 +- + arch/hexagon/include/asm/thread_info.h | 4 - + arch/hexagon/kernel/signal.c | 2 +- + arch/ia64/include/asm/thread_info.h | 4 - + arch/ia64/kernel/signal.c | 2 +- + arch/m32r/include/asm/thread_info.h | 5 - + arch/m32r/kernel/signal.c | 2 +- + arch/m68k/include/asm/thread_info.h | 4 - + arch/m68k/kernel/signal.c | 4 +- + arch/metag/include/asm/thread_info.h | 6 +- + arch/metag/kernel/signal.c | 2 +- + arch/microblaze/include/asm/thread_info.h | 4 - + arch/microblaze/kernel/signal.c | 2 +- + arch/mips/include/asm/thread_info.h | 4 - + arch/mips/include/uapi/asm/mman.h | 1 + + arch/mips/kernel/asm-offsets.c | 1 - + arch/mips/kernel/signal.c | 2 +- + arch/mips/kernel/signal32.c | 2 +- + arch/mn10300/include/asm/thread_info.h | 4 - + arch/mn10300/kernel/asm-offsets.c | 1 - + arch/mn10300/kernel/signal.c | 2 +- + arch/openrisc/include/asm/thread_info.h | 4 - + arch/openrisc/kernel/signal.c | 2 +- + arch/parisc/include/asm/thread_info.h | 4 - + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/parisc/kernel/signal.c | 2 +- + arch/powerpc/include/asm/pgtable-ppc64.h | 2 + + arch/powerpc/include/asm/thread_info.h | 4 - + arch/powerpc/kernel/signal_32.c | 4 +- + arch/powerpc/kernel/signal_64.c | 2 +- + arch/s390/include/asm/thread_info.h | 4 - + arch/s390/kernel/compat_signal.c | 2 +- + arch/s390/kernel/signal.c | 2 +- + arch/score/include/asm/thread_info.h | 4 - + arch/score/kernel/asm-offsets.c | 1 - + arch/score/kernel/signal.c | 2 +- + arch/sh/include/asm/thread_info.h | 4 - + arch/sh/kernel/asm-offsets.c | 1 - + arch/sh/kernel/signal_32.c | 4 +- + arch/sh/kernel/signal_64.c | 4 +- + arch/sparc/include/asm/pgtable_64.h | 9 + + arch/sparc/include/asm/thread_info_32.h | 6 - + arch/sparc/include/asm/thread_info_64.h | 12 +- + arch/sparc/kernel/signal32.c | 4 +- + arch/sparc/kernel/signal_32.c | 2 +- + arch/sparc/kernel/signal_64.c | 2 +- + arch/sparc/kernel/traps_64.c | 2 - + arch/tile/include/asm/thread_info.h | 4 - + arch/tile/kernel/signal.c | 2 +- + arch/um/include/asm/thread_info.h | 4 - + arch/unicore32/include/asm/thread_info.h | 4 - + arch/unicore32/kernel/signal.c | 2 +- + arch/x86/ia32/ia32_signal.c | 2 +- + arch/x86/include/asm/pgtable.h | 5 + + arch/x86/include/asm/thread_info.h | 4 - + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/signal.c | 2 +- + arch/x86/um/signal.c | 2 +- + arch/xtensa/include/asm/thread_info.h | 5 - + arch/xtensa/include/uapi/asm/mman.h | 1 + + arch/xtensa/kernel/signal.c | 2 +- + block/genhd.c | 2 +- + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 3 + + drivers/input/input.c | 9 + + drivers/input/leds.c | 272 ++++++++++++++++ + drivers/leds/Kconfig | 3 - + drivers/misc/ti-st/st_core.c | 2 +- + drivers/rtc/rtc-isl12057.c | 324 ++++++++++++++++++- + drivers/tty/Kconfig | 4 + + drivers/tty/vt/keyboard.c | 110 +++++-- + fs/ext4/fsync.c | 5 +- + fs/fat/cache.c | 38 ++- + fs/fat/fat.h | 4 + + fs/fat/file.c | 62 ++++ + fs/fat/inode.c | 68 +++- + fs/mpage.c | 23 +- + fs/ocfs2/aops.c | 258 ++++++++++++++- + fs/ocfs2/dlm/dlmast.c | 6 +- + fs/ocfs2/dlm/dlmmaster.c | 10 - + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/ocfs2/file.c | 108 +++---- + fs/ocfs2/file.h | 9 + + fs/ocfs2/inode.c | 10 +- + fs/ocfs2/inode.h | 2 + + fs/ocfs2/journal.c | 115 +++++-- + fs/ocfs2/journal.h | 5 + + fs/ocfs2/namei.c | 348 +++++++++++++++++++++ + fs/ocfs2/namei.h | 5 + + fs/ocfs2/ocfs2.h | 15 + + fs/ocfs2/ocfs2_fs.h | 5 +- + fs/ocfs2/ocfs2_trace.h | 3 + + fs/ocfs2/super.c | 2 + + fs/select.c | 2 +- + include/linux/crc64_ecma.h | 56 ++++ + include/linux/fs.h | 8 +- + include/linux/huge_mm.h | 4 + + include/linux/init_task.h | 3 + + include/linux/input.h | 28 ++ + include/linux/kexec.h | 2 + + include/linux/oom.h | 5 - + include/linux/rmap.h | 9 +- + include/linux/sched.h | 2 + + include/linux/string.h | 1 + + include/linux/vm_event_item.h | 1 + + include/uapi/asm-generic/mman-common.h | 1 + + init/Kconfig | 16 - + init/main.c | 5 - + kernel/compat.c | 5 +- + kernel/exit.c | 12 +- + kernel/futex.c | 2 +- + kernel/signal.c | 2 +- + kernel/time/alarmtimer.c | 2 +- + kernel/time/hrtimer.c | 2 +- + kernel/time/posix-cpu-timers.c | 3 +- + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 ++++++++++++++++++++ + lib/vsprintf.c | 20 +- + mm/Makefile | 2 +- + mm/fremap.c | 283 ----------------- + mm/huge_memory.c | 35 +++ + mm/madvise.c | 150 +++++++++ + mm/memory.c | 2 + + mm/memory_hotplug.c | 11 +- + mm/mmap.c | 69 ++++ + mm/nommu.c | 8 - + mm/page_alloc.c | 95 +++--- + mm/page_isolation.c | 7 +- + mm/rmap.c | 46 ++- + mm/util.c | 30 ++ + mm/vmscan.c | 64 +++- + mm/vmstat.c | 1 + + 162 files changed, 2693 insertions(+), 784 deletions(-) + create mode 100644 drivers/input/leds.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c + delete mode 100644 mm/fremap.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: 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 + + 95b679d5e363...9242687a4602 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (9242687a4602 mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 +++++++ + drivers/gpio/gpio-zevio.c | 4 ++++ + drivers/w1/w1_int.c | 3 +-- + mm/backing-dev.c | 35 +++++++++++++++++++++++++++++++ + 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..82c37e0249a6 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing jdelvare-hwmon based on 3.17 +Unchanged quilt series jdelvare-hwmon diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..059c3ac43847 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20141221 |