diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-02-25 14:49:15 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-02-25 14:49:15 +1100 |
| commit | 7068823ce1ed67ffa2130205fd69d0d5ef90dfc8 (patch) | |
| tree | dbcb8f1d78315cddeb5ede11c71c9b8a6e4df23f | |
| parent | 6bcceb6ab16689fd8908b435c460df86a7b944b3 (diff) | |
Add linux-next specific files for 20150225next-20150225
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 208 | ||||
| -rw-r--r-- | Next/Trees | 210 | ||||
| -rw-r--r-- | Next/merge.log | 2353 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2774 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..b4bc171e2b38 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,208 @@ +Name SHA1 +---- ---- +origin b24e2bdde4af656bb0679a101265ebb8f8735d3c +fixes b94d525e58dc9638dd3f98094cb468bcfb262039 +kbuild-current a16c5f99a28c9945165c46da27fff8e6f26f8736 +arc-current 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd +arm-current 23be7fdafa50c42b7aa6ebcf0c090dea09e2ef08 +m68k-current 4436820a98cdaf497a874323095e328831030956 +metag-fixes c2996cb29bfb73927a79dc96e598a718e843f01a +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-merge 31345e1a071e4e5f2fa8b6be5ca7d1cbce20cfca +powerpc-merge-mpe c59c961ca511dc7ee2f4f7e9c224d16f5c76ca6e +sparc 66d0f7ec9f1038452178b1993fc07fd96d30fd38 +net 5c2d2b148b35a995f0c0e76a3a37902ec98f164c +ipsec ac37e2515c1a89c477459a2020b6bfdedabdb91b +sound-current 37ed398839fa3e0d2de77925097db7a370abb096 +pci-current c517d838eb7d07bbe9507871fab3931deccff539 +wireless-drivers aeb2d2a4c0ae1739a6e1782bd8c1c96aee8db4e1 +driver-core.current c517d838eb7d07bbe9507871fab3931deccff539 +tty.current c517d838eb7d07bbe9507871fab3931deccff539 +usb.current b20b1618b8fca858c83e52da4aa22cd6b13b0359 +usb-gadget-fixes a0456399fb07155637a2b597b91cc1c63bc25141 +usb-serial-fixes a6f0331236fa75afba14bbcf6668d42cebb55c43 +staging.current c517d838eb7d07bbe9507871fab3931deccff539 +char-misc.current c517d838eb7d07bbe9507871fab3931deccff539 +input-current 4c971aa78314253cce914ed29e3d90df3326d646 +crypto-current 96692a7305c49845e3cbf5a60cfcb207c5dc4030 +ide f96fe225677b3efb74346ebd56fafe3997b02afa +devicetree-current 6b1271de3723a7957c7cc6a7f36ea114f557e730 +rr-fixes f476893459318cb2eff3ecd2a05d4ceacf82e73e +vfio-fixes 7c2e211f3c95b91912a92a8c6736343690042e2e +kselftest-fixes f5db310d77ef1742e40bfc303b8625584c55f9e3 +drm-intel-fixes f37b5c2be8979993efee2da50b51126e3908eb8b +asm-generic 643165c8bbc8617d8222cb50c89e34fe64d226cf +arc c517d838eb7d07bbe9507871fab3931deccff539 +arm 42203614b435558d96afe3d1f45173aef666f7ca +arm-perf 97bf6af1f928216fd6c5a66e8a57bfa95a659672 +arm-soc d88d6cfc912e9e54f9ec0337a84691436c654077 +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +berlin c517d838eb7d07bbe9507871fab3931deccff539 +cortex-m e799b6f37e6ccd7b97e3e2df62a30f1c5b211290 +imx-mxs 395ae1400a359cc04016ccf6e9ba83283c61509b +keystone b17275a4a6cc61e0b7da40558ff5c7250fb80917 +mvebu 444fdf947de3bf5ac6b6ac033eb9d877a4b7e90d +omap 67fd14b3eca63b14429350e9eadc5fab709a8821 +omap-pending 30aa18d3bea5f9470af5aa48ab8df88bde97c795 +renesas 0da08f6fee00578e738db006a2d9b17d9b0f48de +samsung aeb011501873355fb618828aac6a21c04b251614 +sunxi 50997798fb8a1f4a419577146970a68689999d2e +tegra 794345d409ad2ab082ebdff4c26b9487434f5a58 +arm64 d476d94f180af3f0fca77394651d4a98f4df1c54 +blackfin 275f5a8573e7832d0cf344a1b29da357c7038870 +c6x ae72758f1dd93bd367dc7719702f24a9bfb3bad9 +cris 9987c19ed9a71693bf3efce2957666b2513a5252 +hexagon 8914d7e857807e1e60975000cba3750c9b2643e8 +ia64 a6b8978c54b771308f6f1692b9735ac0bb087cc2 +m68k 4436820a98cdaf497a874323095e328831030956 +m68knommu c517d838eb7d07bbe9507871fab3931deccff539 +metag f93125ae17d1d259b5aba84016db260903822194 +microblaze a01d37d914f98c430854bbae2402e6f51d9a8d0b +mips 64b139f97c01f3624b3f0a4e84f65b0c2bf2ebda +nios2 d16d2be111a61baf3a4696f07bfc7a8e36697cec +parisc-hd bfa76d49576599a4b9f9b7a71f23d73d6dcff735 +powerpc d557b09800dab5dd6804e5b79324069abcf0be11 +powerpc-mpe a6130ed253a931d2169c26ab0958d81b0dce4d6e +fsl 0dc294f717d41bfbafc746a7a96a7bc0f114c20c +mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +s390 2aa7c23d8a9bbc50360ec5867d52803a744ba802 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 740e1433f50e6d0f1c4705c1a963645072f5a74c +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 1f2fdbd0078cb2ad4251768e8c0e0bb652a2cbd6 +btrfs a742994aa2e271eb8cd8e043d276515ec858ed73 +ceph 388cfdc9bc19cc189b86770dba55910018e8e0fc +cifs 5a090583c3fc9e6f9a53790f67134f67789e0362 +ecryptfs e7a823be2adc2c8617bead1376194a399143e4ed +ext3 6981498d7956e3177b6f74926aa4a5c2a45b4edb +ext4 6f30b7e37a8239f9d27db626a1d3427bc7951908 +f2fs db3ecdee1cf0538f11832f7ef66945c4dd903918 +fscache 1a8ed18fb7db48c916c2ccd484e04bd4dd737834 +fuse 9759bd51899458af4f4bcc11046f01285642ca10 +gfs2 89d4899e65a7e368cf90854805402fac548ecbb3 +jfs 648695c74811f09a8ad80d7c3be72b8169589a64 +nfs 7a27eae362ae1494b7a4f4c4d9137fc04fa34e63 +nfsd a1d1e9be5a1dafe0ddc2181a9201c2ae29c71eff +overlayfs 4330397e4e8a662f36d101659e2a59ce32e76ff4 +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs f15844e0777fec936f87a87f97394f83911dacd3 +ubifs b388e6a7a6ba988998ddd83919ae8d3debf1a13d +xfs 88e8fda99a4c99a1a6482510655dbd88cccd221b +file-locks b2b89ebfc0f0287e20516a5443d93af309b800cf +vfs ca160d0085b6099b8ccd5bf60efd8c2aca99a3c9 +pci c517d838eb7d07bbe9507871fab3931deccff539 +hid b14f9dc6591fb232d7140589093e7394bc663537 +i2c c517d838eb7d07bbe9507871fab3931deccff539 +jdelvare-hwmon 26bc420b59a38e4e6685a73345a0def461136dce +hwmon-staging 9248faef66cdd616d15f5901e0d6447c679fccef +v4l-dvb 48b777c0833bc7392679405539bb5d3ed0900828 +kbuild 8d18d1d514d16ec3e017d493d211e58cd0db37fa +kconfig bfa76d49576599a4b9f9b7a71f23d73d6dcff735 +libata d85aa1624b055cf65d3accfc607eaaa94f87709f +pm 3a64df4a3a4d1d9ca606efbff9f599359956824a +idle 210109f4a19ad6a0a883d9bfc763228ac65a6671 +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +thermal 4531fa1684bb883ee01f1a182900b1e15d461b34 +thermal-soc 1a9f3d3782f96db8c7526cfe1bba84dc84ae7d3f +ieee1394 d71e6a11737f4b3d857425a1d6f893231cbd1296 +dlm 2ab4bd8ea3a6954bc79a9bbeb291cd6c2d6213a7 +swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8 +slave-dma 771bd4f095dd3b86b8d2564366946bf1d4179b8a +net-next 92bf200881d978bc3c6a290991ae1f9ddc7b5411 +ipsec-next ff660f75be36e6db75d45dc742a4a468c5a9c20d +wireless-drivers-next d53071143aa5a7cb37cf7db8101042e700b5413f +bluetooth 03f310efd4b19ddc2cca15ae67f48295554adbfe +infiniband 147d1da951cf067badb7d3585002e1eb46719f83 +mtd c517d838eb7d07bbe9507871fab3931deccff539 +l2-mtd d6a3f0176fe03c33f2853dfef33e15547e357dd0 +crypto db71f29a1c327f3824c1c0919937965b36d67b80 +drm 45ee2dbc65cbf6910892c480e6f428be342fa733 +drm-panel 23923ebaac52884829118a4ff2e963ec61136d45 +drm-intel 80958155d684c917a954c24951d590bec942dbaf +drm-tegra 07d05cbf60ed8f06c61484d3d85c06c1aa7edf38 +drm-misc e045d20bef41707dbba676e58624b54f9f39e172 +sound 72f770c6acde425eaad8f482969a785af4512f4f +sound-asoc 0179015b2c7f348a48a13cea85c745171b6cf9fd +modules 9cc019b8c94fa59e02fd82f15f7b7d689e35c190 +virtio 5b40a7daf51812b35cf05d1601a779a7043f8414 +input 290b799c390d77d27effee3ce312203aaa32ee74 +block 434c264781668a38a6779202b792f7d95a77a12b +device-mapper 9068f2f15d5fc7a5c9dc6e6963913216ede0c745 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh 802ea9d8645d33d24b7b4cd4537c14f3e698bde0 +kgdb dd8f30cc0550f36861ddfa42c27cc5c580b0bf8c +md 26ac107378c4742978216be1005b7291b799c7b2 +mfd 0a65fbf64dad890d9dd60ab1dc0ebdb9fb0a9e33 +backlight 1926469377bb20d20662fc505b6b36f43b412381 +battery 9e23e22cd61adff1b908dd376b958a491f2f5378 +omap_dss2 d6c2152b3efd73be265f426b5a1bb50ec436d999 +regulator 224c7f4452a2713c56ccd12e111936439347c838 +security 04f81f0154e4bf002be6f4d85668ce1257efa4d9 +integrity 7bea7ff67e0cbb30f53ebee7194e238491ddeaab +selinux 387fb779789d504f5b09b042b6485dfd0ddb8831 +lblnet b2776bf7149bddd1f4161f14f79520f17fc1d71d +watchdog c517d838eb7d07bbe9507871fab3931deccff539 +iommu a20cc76b9efae10c20123049df361adcd7f0e0b3 +dwmw2-iommu 1860e379875dfe7271c649058aeddffe5afd9d0d +vfio 6140a8f5623820cec7f56c63444b9551d8d35775 +osd 1fa3a002b2546c42c343c77c144871285896ced5 +jc_docs 52e68924dfa8d9de5d82f6798352eecc5f03a97d +trivial edb0ec0725bb9797ded0deaf172a6795e43795c8 +audit 5b28255278dd7e594c8dde317c2498b7dcbf900d +devicetree fca8ba4ee24d17f8845ed1c8edcc3fd81c4650c2 +dt-rh 3c3c8e3618b018aee1dfd42343a74f3ab5ddf23c +mailbox 9f3e3cacb2ffdefe28c7cf490bf543e4dcb2770a +spi a12329cfd181bfc5e9c451d2488e3586b6d9bd8a +tip d0a45fc13f1669ef274a6e2fe7ba8130bf954524 +clockevents 4c8305221193e14752e0fa833a38f856bbe1d22b +edac fec53af531dd040e41fe358abe00b33747af2688 +edac-amd 30263b4052c6bf337641e24b64eaa87fe57adf8d +irqchip 91d1179212161f220938198b742c328ad38fd0a3 +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace c19565fc83e6cdb6da8eef166964c887e66e969f +rcu b52e22f3021dc0355969c6110da729dd5d48f5d7 +kvm 4ff6f8e61eb7f96d3ca535c6d240f863ccd6fb7d +kvm-arm 4b990589952f0e30aa860184ac6c76219a74632e +kvm-ppc 2c4aa55a6af070262cca425745e8e54310e96b8d +kvms390 de8e5d744051568c8aad35c1c2dcf8fd137d10c9 +xen-tip a2e75bc2ee207351e6806e77a5379c6c1dd4598a +percpu 4c907baf36d8339f393bb576d0bab29194d0e6ad +workqueues b5b3ab523e31129f9291322a934b0730eaa06970 +drivers-x86 c57c0fa4bc9c2ad023674ef478c25719abaace7d +chrome-platform 5502486a2077e4280c618b82e8a77ed35932956f +regmap 48bbdbb173faf2c1659d21a3720768848651e414 +hsi f034125dfdae466b3e6ad155e722de48d64b82d4 +leds ffe2428614d2eab5399b9a934fcc614ab0d8bc53 +ipmi 3a31f945b70990f6113b4800338c09d14620dff3 +driver-core c517d838eb7d07bbe9507871fab3931deccff539 +tty c517d838eb7d07bbe9507871fab3931deccff539 +usb c517d838eb7d07bbe9507871fab3931deccff539 +usb-gadget c517d838eb7d07bbe9507871fab3931deccff539 +usb-serial 3e264ffc831e70c4a3ecc8c2eeb5bfbc1c8a30d3 +staging c517d838eb7d07bbe9507871fab3931deccff539 +char-misc c517d838eb7d07bbe9507871fab3931deccff539 +cgroup 8abba61bcfd4e1cf122b3ba71cfef3dc026136ea +scsi cad8000836ef4ba85beb68d937763f9c767b38f9 +target-updates aa04dae454d087376d97f44710c4422df030a8f2 +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +pinctrl c517d838eb7d07bbe9507871fab3931deccff539 +vhost 4fe00489e61c9870bc2bc36dc49bbccd39d3c7a4 +remoteproc 9a3c4145af32125c5ee39c0272662b47307a8323 +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio 2f97c20e5f7c3582c7310f65a04465bfb0fd0e85 +dma-mapping dda02fd6278d9e995850b3c1dba484f17cbe4de4 +pwm b65af27ad89de60ca55721f9368b18d49ba1f269 +dma-buf 817bd7253291fc69d83d4340a7e186f3e6933169 +userns db86da7cb76f797a1a8b445166a15cb922c6ff85 +ktest 7c2c49eceb79eb4738f38a00270830057b5bfb76 +clk ec02ace8ca0a50eef430d3676de5c5fa978b0e29 +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +aio 5f785de588735306ec4d7c875caf9d28481c8b21 +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +kselftest 6ddf898c23d62c974e148efd9e509731324a167a +y2038 ed8c2241c1ae1b64e4a783ae7a2c685c93142a8d +luto-misc 2de841c94229b71cfaa4f9ee8a090434a543845e +access_once c5b19946eb76c67566aae6a84bf2b10ad59295ea +livepatching 0937e3b025f70e33f018aa55ee8d32b8731730a7 +akpm-current d07b956c650ad58a8ce00517515ebaf962e1f5c7 +akpm 615f9737253aa406404487de68d6c1203b097b27 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..07b3c7f178b4 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,210 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-fixes +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +devicetree-current git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.rocketboards.org/linux-socfpga-next.git#nios2-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux-3/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm-intel#topic/drm-misc +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +virtio git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.infradead.org/battery-2.6.git#master +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/pcmoore/audit#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +tiny git git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git#tiny/next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git#for-next +ipmi git git://git.code.sf.net/p/openipmi/linux-ipmi#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +clk git git://git.linaro.org/people/mturquette/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +access_once git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..39f0677f69f8 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2353 @@ +$ date +Wednesday 25 February 10:40:25 AEDT 2015 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at c517d838eb7d Linux 4.0-rc1 +Merging origin/master (b24e2bdde4af Merge tag 'stable/for-linus-4.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip) +$ git merge origin/master +Updating c517d838eb7d..b24e2bdde4af +Fast-forward + arch/x86/kernel/entry_32.S | 3 +++ + arch/x86/kernel/entry_64.S | 3 +++ + arch/x86/lguest/Kconfig | 4 ++-- + arch/x86/xen/enlighten.c | 20 ++++++++++++++++++- + drivers/hid/hid-core.c | 2 ++ + drivers/hid/hid-ids.h | 2 ++ + drivers/hid/hid-microsoft.c | 2 ++ + drivers/hid/hid-saitek.c | 2 ++ + drivers/hid/hid-sensor-hub.c | 8 +++++--- + drivers/hid/hid-sony.c | 6 ++++-- + drivers/hid/i2c-hid/i2c-hid.c | 7 +++++-- + drivers/hid/wacom_wac.c | 11 ++++++++--- + drivers/xen/Makefile | 2 +- + drivers/xen/preempt.c | 44 ++++++++++++++++++++++++++++++++++++++++++ + drivers/xen/privcmd.c | 2 ++ + drivers/xen/xen-scsiback.c | 14 ++++++-------- + include/linux/hid-sensor-hub.h | 5 +++++ + include/xen/xen-ops.h | 26 +++++++++++++++++++++++++ + kernel/livepatch/core.c | 10 +++++----- + 19 files changed, 146 insertions(+), 27 deletions(-) + create mode 100644 drivers/xen/preempt.c +Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (a16c5f99a28c kbuild: Fix removal of the debian/ directory) +$ 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 (23be7fdafa50 ARM: 8305/1: DMA: Fix kzalloc flags in __iommu_alloc_buffer()) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (4436820a98cd m68k/defconfig: Enable Ethernet bridging) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (c2996cb29bfb metag: Fix KSTK_EIP() and KSTK_ESP() macros) +$ git merge metag-fixes/fixes +Merge made by the 'recursive' strategy. + arch/metag/include/asm/processor.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +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 (c59c961ca511 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux) +$ 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 (5c2d2b148b35 r8169: Fix trivial typo in rtl_check_firmware) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btusb.c | 1 + + drivers/isdn/hardware/mISDN/hfcpci.c | 2 +- + drivers/net/Kconfig | 2 +- + drivers/net/appletalk/Kconfig | 2 +- + drivers/net/dsa/bcm_sf2.h | 2 +- + drivers/net/ethernet/altera/altera_tse_main.c | 47 +++-- + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 57 +++--- + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h | 6 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 246 +++++++++++++++----------- + drivers/net/ethernet/realtek/r8169.c | 32 +--- + drivers/net/ethernet/smsc/smc91x.c | 2 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +- + drivers/net/phy/phy.c | 23 ++- + drivers/net/team/team.c | 4 +- + drivers/net/usb/hso.c | 2 +- + drivers/net/usb/plusb.c | 5 + + drivers/net/wan/cosa.c | 12 +- + drivers/net/xen-netback/netback.c | 29 ++- + include/linux/netdevice.h | 1 + + include/linux/rhashtable.h | 9 +- + include/net/caif/cfpkt.h | 2 +- + include/uapi/linux/tc_act/Kbuild | 1 + + lib/rhashtable.c | 36 ++-- + lib/test_rhashtable.c | 8 +- + net/caif/cffrml.c | 2 +- + net/caif/cfpkt_skbuff.c | 6 +- + net/compat.c | 9 - + net/core/dev.c | 2 +- + net/core/ethtool.c | 1 + + net/core/gen_stats.c | 15 +- + net/core/pktgen.c | 3 + + net/core/rtnetlink.c | 4 +- + net/core/skbuff.c | 5 +- + net/decnet/dn_route.c | 2 +- + net/ipv4/ip_fragment.c | 2 +- + net/ipv4/tcp_input.c | 2 +- + net/ipv6/addrconf.c | 17 +- + net/irda/ircomm/ircomm_tty.c | 2 +- + net/irda/irnet/irnet_ppp.c | 4 +- + net/netfilter/ipvs/ip_vs_ctl.c | 2 +- + net/netfilter/nft_compat.c | 12 +- + net/netfilter/xt_recent.c | 11 +- + net/netfilter/xt_socket.c | 21 ++- + net/openvswitch/datapath.c | 45 ++++- + net/openvswitch/vport.h | 2 + + net/packet/af_packet.c | 20 ++- + net/sched/ematch.c | 1 + + 47 files changed, 443 insertions(+), 280 deletions(-) +Merging ipsec/master (ac37e2515c1a xfrm: release dst_orig in case of error in xfrm_lookup()) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/dst.h | 1 + + net/ipv4/xfrm4_output.c | 2 +- + net/ipv6/xfrm6_output.c | 2 +- + net/ipv6/xfrm6_policy.c | 1 + + net/xfrm/xfrm_policy.c | 12 ++++++------ + 5 files changed, 10 insertions(+), 8 deletions(-) +Merging sound-current/for-linus (37ed398839fa ALSA: hda: controller code - do not export static functions) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/pcm_native.c | 2 ++ + sound/firewire/amdtp.c | 5 ++--- + sound/firewire/bebob/bebob.c | 20 ++++++++++++++++---- + sound/firewire/bebob/bebob_stream.c | 16 ++++------------ + sound/firewire/dice/dice-stream.c | 18 ++++++++++++------ + sound/firewire/dice/dice.c | 16 +++++++++++----- + sound/firewire/fireworks/fireworks.c | 20 ++++++++++++++------ + sound/firewire/fireworks/fireworks_stream.c | 19 ++++++++++--------- + sound/firewire/oxfw/oxfw-stream.c | 6 ++++-- + sound/firewire/oxfw/oxfw.c | 21 ++++++++++++++------- + sound/pci/hda/hda_controller.c | 5 ----- + sound/pci/hda/patch_sigmatel.c | 17 ++++++++++++++++- + 12 files changed, 105 insertions(+), 60 deletions(-) +Merging pci-current/for-linus (c517d838eb7d Linux 4.0-rc1) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-drivers/master (aeb2d2a4c0ae rtlwifi: Remove logging statement that is no longer needed) +$ git merge wireless-drivers/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (c517d838eb7d Linux 4.0-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (c517d838eb7d Linux 4.0-rc1) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (b20b1618b8fc cdc-acm: Add support for Denso cradle CU-321) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/class/cdc-acm.c | 2 + + drivers/usb/core/devio.c | 2 + + drivers/usb/dwc3/dwc3-omap.c | 30 ++++++++- + drivers/usb/gadget/configfs.c | 2 - + drivers/usb/gadget/function/f_hid.c | 2 +- + drivers/usb/gadget/function/f_phonet.c | 5 +- + drivers/usb/gadget/function/f_sourcesink.c | 4 +- + drivers/usb/gadget/function/f_uac2.c | 34 +++++----- + drivers/usb/gadget/function/uvc_v4l2.c | 1 + + drivers/usb/gadget/function/uvc_video.c | 1 + + drivers/usb/gadget/legacy/g_ffs.c | 6 +- + drivers/usb/host/xhci-plat.c | 19 +++--- + drivers/usb/host/xhci-ring.c | 2 +- + drivers/usb/host/xhci.c | 100 ++++++++++++++++++++++++++--- + drivers/usb/host/xhci.h | 7 +- + drivers/usb/isp1760/isp1760-hcd.c | 6 +- + drivers/usb/musb/musb_core.c | 10 +-- + drivers/usb/musb/musb_dsps.c | 32 ++++++++- + drivers/usb/musb/musb_host.c | 2 +- + drivers/usb/musb/omap2430.c | 7 +- + drivers/usb/renesas_usbhs/Kconfig | 1 + + drivers/usb/storage/unusual_uas.h | 7 ++ + drivers/usb/storage/usb.c | 6 ++ + 23 files changed, 226 insertions(+), 62 deletions(-) +Merging usb-gadget-fixes/fixes (a0456399fb07 usb: gadget: configfs: don't NUL-terminate (sub)compatible ids) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (a6f0331236fa USB: cp210x: add ID for RUGGEDCOM USB Serial Console) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (c517d838eb7d Linux 4.0-rc1) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (c517d838eb7d Linux 4.0-rc1) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (4c971aa78314 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (96692a7305c4 crypto: tcrypt - do not allocate iv on stack for aead speed tests) +$ 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 devicetree-current/devicetree/merge (6b1271de3723 of/unittest: Overlays with sub-devices tests) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (f47689345931 lguest: update help text.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (7c2e211f3c95 vfio-pci: Fix the check on pci device type in vfio_pci_probe()) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (f5db310d77ef selftests/vm: fix link error for transhuge-stress test) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (f37b5c2be897 drm/i915: Align initial plane backing objects correctly) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_drv.h | 15 ++++++++++++++- + drivers/gpu/drm/i915/i915_gem.c | 3 +-- + drivers/gpu/drm/i915/i915_gem_stolen.c | 6 ++---- + drivers/gpu/drm/i915/i915_gem_tiling.c | 7 ++++--- + drivers/gpu/drm/i915/i915_irq.c | 22 ++++++++++++++++++++++ + drivers/gpu/drm/i915/intel_display.c | 30 ++++++++++++++++++++++++------ + drivers/gpu/drm/i915/intel_lrc.c | 8 ++++---- + include/drm/i915_pciids.h | 4 ++-- + 8 files changed, 73 insertions(+), 22 deletions(-) +Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (c517d838eb7d Linux 4.0-rc1) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (42203614b435 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm-perf/for-next/perf (97bf6af1f928 Linux 3.19-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (d88d6cfc912e ARM: mm: Remove Kconfig symbol CACHE_PL310) +$ git merge arm-soc/for-next +Already up-to-date. +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (c517d838eb7d Linux 4.0-rc1) +$ git merge berlin/berlin/for-next +Already up-to-date. +Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M) +$ git merge cortex-m/for-next +Auto-merging arch/arm/boot/compressed/head.S +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/head.S | 33 +++++++++++++++++++++++++++------ + arch/arm/include/asm/unified.h | 8 ++++++++ + 2 files changed, 35 insertions(+), 6 deletions(-) +Merging imx-mxs/for-next (395ae1400a35 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (444fdf947de3 ARM: mvebu: Add Device Tree description of SDHCI for Armada 388 RD) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-388-rd.dts | 10 ++++++++++ + arch/arm/boot/dts/armada-38x.dtsi | 7 +++++-- + 2 files changed, 15 insertions(+), 2 deletions(-) +Merging omap/for-next (67fd14b3eca6 ARM: dts: am335x-bone*: usb0 is hardwired for peripheral) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-bone-common.dtsi | 1 + + arch/arm/boot/dts/am437x-idk-evm.dts | 25 ++--------------------- + arch/arm/boot/dts/am57xx-beagle-x15.dts | 8 -------- + arch/arm/boot/dts/dm8168-evm.dts | 25 +++++++++++++++++++++++ + arch/arm/boot/dts/dm816x.dtsi | 34 +++++++++++++++++++++++++++---- + arch/arm/boot/dts/dra7-evm.dts | 8 -------- + arch/arm/boot/dts/dra7.dtsi | 8 ++++---- + arch/arm/boot/dts/dra72-evm.dts | 8 -------- + arch/arm/boot/dts/omap2.dtsi | 4 ++-- + arch/arm/boot/dts/omap3-n900.dts | 9 +++++++- + arch/arm/boot/dts/omap3.dtsi | 4 ++-- + arch/arm/boot/dts/omap4.dtsi | 4 ++-- + arch/arm/boot/dts/omap5.dtsi | 8 ++++---- + arch/arm/configs/omap2plus_defconfig | 4 +++- + 14 files changed, 83 insertions(+), 67 deletions(-) +Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) +$ git merge omap-pending/for-next +Merge made by the 'recursive' strategy. +Merging renesas/next (0da08f6fee00 Merge branch 'heads/defconfig-for-v4.1' into next) +$ git merge renesas/next +Removing arch/arm/mach-shmobile/sleep-sh7372.S +Removing arch/arm/mach-shmobile/sh7372.h +Removing arch/arm/mach-shmobile/setup-sh7372.c +Removing arch/arm/mach-shmobile/pm-sh7372.c +Removing arch/arm/mach-shmobile/intc-sh7372.c +Removing arch/arm/mach-shmobile/include/mach/uncompress.h +Removing arch/arm/mach-shmobile/include/mach/system.h +Removing arch/arm/mach-shmobile/include/mach/sdhi.h +Removing arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h +Removing arch/arm/mach-shmobile/include/mach/mmc.h +Removing arch/arm/mach-shmobile/include/mach/mmc-mackerel.h +Removing arch/arm/mach-shmobile/include/mach/head-mackerel.txt +Removing arch/arm/mach-shmobile/include/mach/clkdev.h +Removing arch/arm/mach-shmobile/entry-intc.S +Removing arch/arm/mach-shmobile/clock-sh7372.c +Removing arch/arm/mach-shmobile/board-mackerel.c +Removing arch/arm/mach-shmobile/board-kzm9g-reference.c +Removing arch/arm/mach-shmobile/board-ape6evm.c +Removing arch/arm/mach-shmobile/board-ape6evm-reference.c +Removing arch/arm/configs/mackerel_defconfig +Removing arch/arm/configs/ape6evm_defconfig +Removing arch/arm/boot/dts/sh73a0-kzm9g-reference.dts +Removing arch/arm/boot/dts/sh7372.dtsi +Removing arch/arm/boot/dts/sh7372-mackerel.dts +Removing arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts +Removing arch/arm/boot/compressed/sdhi-shmobile.h +Removing arch/arm/boot/compressed/sdhi-shmobile.c +Removing arch/arm/boot/compressed/sdhi-sh7372.c +Removing arch/arm/boot/compressed/mmcif-sh7372.c +Removing Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt +Removing Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt +Removing Documentation/arm/SH-Mobile/vrl4.c +Removing Documentation/arm/SH-Mobile/Makefile +Removing Documentation/arm/Makefile +Merge made by the 'recursive' strategy. + Documentation/Makefile | 2 +- + Documentation/arm/Makefile | 1 - + Documentation/arm/SH-Mobile/Makefile | 7 - + Documentation/arm/SH-Mobile/vrl4.c | 170 --- + Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt | 29 - + Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt | 42 - + Documentation/devicetree/bindings/arm/shmobile.txt | 8 - + .../devicetree/bindings/bus/renesas,bsc.txt | 46 + + .../devicetree/bindings/bus/simple-pm-bus.txt | 44 + + .../bindings/power/renesas,sysc-rmobile.txt | 1 + + MAINTAINERS | 2 - + arch/arm/Kconfig | 30 - + arch/arm/Kconfig.debug | 10 +- + arch/arm/boot/compressed/Makefile | 15 - + arch/arm/boot/compressed/head-shmobile.S | 30 - + arch/arm/boot/compressed/mmcif-sh7372.c | 88 -- + arch/arm/boot/compressed/sdhi-sh7372.c | 95 -- + arch/arm/boot/compressed/sdhi-shmobile.c | 449 ------ + arch/arm/boot/compressed/sdhi-shmobile.h | 11 - + arch/arm/boot/dts/Makefile | 9 +- + arch/arm/boot/dts/emev2-kzm9d.dts | 13 + + arch/arm/boot/dts/emev2.dtsi | 10 + + arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 156 -- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 37 +- + arch/arm/boot/dts/r8a73a4.dtsi | 557 ++++++- + arch/arm/boot/dts/r8a7740.dtsi | 79 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 144 ++ + arch/arm/boot/dts/r8a7778.dtsi | 238 +++ + arch/arm/boot/dts/r8a7790.dtsi | 102 +- + arch/arm/boot/dts/r8a7791-henninger.dts | 11 + + arch/arm/boot/dts/r8a7791-koelsch.dts | 50 +- + arch/arm/boot/dts/r8a7791.dtsi | 122 +- + arch/arm/boot/dts/r8a7794-alt.dts | 13 + + arch/arm/boot/dts/r8a7794.dtsi | 157 +- + arch/arm/boot/dts/sh7372-mackerel.dts | 26 - + arch/arm/boot/dts/sh7372.dtsi | 35 - + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 366 ----- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 378 ++++- + arch/arm/boot/dts/sh73a0.dtsi | 245 +++- + arch/arm/configs/ape6evm_defconfig | 109 -- + arch/arm/configs/mackerel_defconfig | 157 -- + arch/arm/configs/shmobile_defconfig | 5 + + arch/arm/mach-shmobile/Kconfig | 61 +- + arch/arm/mach-shmobile/Makefile | 13 +- + arch/arm/mach-shmobile/Makefile.boot | 4 - + arch/arm/mach-shmobile/board-ape6evm-reference.c | 60 - + arch/arm/mach-shmobile/board-ape6evm.c | 306 ---- + arch/arm/mach-shmobile/board-bockw-reference.c | 2 + + arch/arm/mach-shmobile/board-kzm9g-reference.c | 62 - + arch/arm/mach-shmobile/board-mackerel.c | 1522 -------------------- + arch/arm/mach-shmobile/clock-sh7372.c | 620 -------- + arch/arm/mach-shmobile/clock.c | 11 - + arch/arm/mach-shmobile/common.h | 1 - + arch/arm/mach-shmobile/entry-intc.S | 54 - + arch/arm/mach-shmobile/include/mach/clkdev.h | 7 - + .../mach-shmobile/include/mach/head-mackerel.txt | 93 -- + arch/arm/mach-shmobile/include/mach/mmc-mackerel.h | 38 - + arch/arm/mach-shmobile/include/mach/mmc.h | 16 - + arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h | 21 - + arch/arm/mach-shmobile/include/mach/sdhi.h | 16 - + arch/arm/mach-shmobile/include/mach/system.h | 11 - + arch/arm/mach-shmobile/include/mach/uncompress.h | 19 - + arch/arm/mach-shmobile/include/mach/zboot.h | 5 +- + arch/arm/mach-shmobile/intc-sh7372.c | 672 --------- + arch/arm/mach-shmobile/pm-sh7372.c | 549 ------- + arch/arm/mach-shmobile/rcar-gen2.h | 1 + + arch/arm/mach-shmobile/setup-r8a7740.c | 8 - + arch/arm/mach-shmobile/setup-r8a7778.c | 19 + + arch/arm/mach-shmobile/setup-r8a7790.c | 1 + + arch/arm/mach-shmobile/setup-r8a7791.c | 1 + + arch/arm/mach-shmobile/setup-r8a7794.c | 1 + + arch/arm/mach-shmobile/setup-rcar-gen2.c | 58 +- + arch/arm/mach-shmobile/setup-sh7372.c | 1016 ------------- + arch/arm/mach-shmobile/setup-sh73a0.c | 19 +- + arch/arm/mach-shmobile/sh7372.h | 84 -- + arch/arm/mach-shmobile/sh73a0.h | 1 - + arch/arm/mach-shmobile/sleep-sh7372.S | 98 -- + arch/arm/mach-shmobile/smp-r8a7779.c | 7 - + arch/arm/mach-shmobile/smp-r8a7790.c | 4 +- + arch/arm/mach-shmobile/smp-r8a7791.c | 2 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 2 +- + arch/arm/tools/mach-types | 1 - + drivers/bus/Kconfig | 53 +- + drivers/bus/Makefile | 15 +- + drivers/bus/simple-pm-bus.c | 58 + + drivers/sh/pm_runtime.c | 2 + + include/dt-bindings/clock/r8a73a4-clock.h | 62 + + include/dt-bindings/clock/r8a7778-clock.h | 71 + + include/dt-bindings/clock/r8a7790-clock.h | 3 + + include/dt-bindings/clock/r8a7791-clock.h | 3 + + include/dt-bindings/clock/sh73a0-clock.h | 3 + + 91 files changed, 2511 insertions(+), 7344 deletions(-) + delete mode 100644 Documentation/arm/Makefile + delete mode 100644 Documentation/arm/SH-Mobile/Makefile + delete mode 100644 Documentation/arm/SH-Mobile/vrl4.c + delete mode 100644 Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt + delete mode 100644 Documentation/arm/SH-Mobile/zboot-rom-sdhi.txt + create mode 100644 Documentation/devicetree/bindings/bus/renesas,bsc.txt + create mode 100644 Documentation/devicetree/bindings/bus/simple-pm-bus.txt + delete mode 100644 arch/arm/boot/compressed/mmcif-sh7372.c + delete mode 100644 arch/arm/boot/compressed/sdhi-sh7372.c + delete mode 100644 arch/arm/boot/compressed/sdhi-shmobile.c + delete mode 100644 arch/arm/boot/compressed/sdhi-shmobile.h + delete mode 100644 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts + delete mode 100644 arch/arm/boot/dts/sh7372-mackerel.dts + delete mode 100644 arch/arm/boot/dts/sh7372.dtsi + delete mode 100644 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts + delete mode 100644 arch/arm/configs/ape6evm_defconfig + delete mode 100644 arch/arm/configs/mackerel_defconfig + delete mode 100644 arch/arm/mach-shmobile/board-ape6evm-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-ape6evm.c + delete mode 100644 arch/arm/mach-shmobile/board-kzm9g-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-mackerel.c + delete mode 100644 arch/arm/mach-shmobile/clock-sh7372.c + delete mode 100644 arch/arm/mach-shmobile/entry-intc.S + delete mode 100644 arch/arm/mach-shmobile/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/head-mackerel.txt + delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc-mackerel.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/mmc.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/sdhi-sh7372.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/sdhi.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/system.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-shmobile/intc-sh7372.c + delete mode 100644 arch/arm/mach-shmobile/pm-sh7372.c + delete mode 100644 arch/arm/mach-shmobile/setup-sh7372.c + delete mode 100644 arch/arm/mach-shmobile/sh7372.h + delete mode 100644 arch/arm/mach-shmobile/sleep-sh7372.S + create mode 100644 drivers/bus/simple-pm-bus.c + create mode 100644 include/dt-bindings/clock/r8a73a4-clock.h + create mode 100644 include/dt-bindings/clock/r8a7778-clock.h +Merging samsung/for-next (aeb011501873 Merge branch 'v3.20-samsung-defconfig-2' into for-next) +$ git merge samsung/for-next +Auto-merging arch/arm/boot/dts/exynos4412-odroid-common.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 14 +++++++ + arch/arm/boot/dts/exynos5250-snow.dts | 56 +++++++++++++++++++++++-- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 31 +++++++++++++- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 17 ++++++++ + arch/arm/configs/exynos_defconfig | 4 +- + 5 files changed, 116 insertions(+), 6 deletions(-) +Merging sunxi/sunxi/for-next (50997798fb8a Merge branch 'sunxi/fixes-for-4.0' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/clock/sunxi.txt | 2 + + arch/arm/boot/dts/Makefile | 10 +- + arch/arm/boot/dts/sun4i-a10-a1000.dts | 200 ++++--- + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 168 +++--- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 214 ++++---- + arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 168 ++++++ + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 187 +++---- + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 104 ++-- + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 140 +++-- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 188 ++++--- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 177 +++--- + arch/arm/boot/dts/sun4i-a10.dtsi | 46 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 315 ++++++----- + arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 132 +++-- + arch/arm/boot/dts/sun5i-a10s.dtsi | 628 +++------------------- + arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 136 +++-- + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 148 +++-- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 236 ++++---- + arch/arm/boot/dts/sun5i-a13.dtsi | 600 +++------------------ + arch/arm/boot/dts/sun5i.dtsi | 560 +++++++++++++++++++ + arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 52 +- + arch/arm/boot/dts/sun6i-a31-colombus.dts | 120 ++--- + arch/arm/boot/dts/sun6i-a31-m9.dts | 148 +++-- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 262 +++++---- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 198 ++++--- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 316 ++++++----- + arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 430 ++++++++------- + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 252 +++++---- + arch/arm/boot/dts/sun7i-a20-m3.dts | 178 +++--- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 186 ++++--- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 288 +++++----- + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 410 +++++++------- + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 191 +++++++ + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 210 ++++---- + arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 110 ++-- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 65 +++ + arch/arm/boot/dts/sun9i-a80.dtsi | 114 ++++ + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/sunxi_defconfig | 2 + + arch/arm/mach-sunxi/Kconfig | 8 +- + drivers/clk/sunxi/Makefile | 1 + + drivers/clk/sunxi/clk-sunxi.c | 88 --- + drivers/clk/sunxi/clk-usb.c | 233 ++++++++ + 43 files changed, 4306 insertions(+), 3916 deletions(-) + create mode 100644 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts + create mode 100644 arch/arm/boot/dts/sun5i.dtsi + create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts + create mode 100644 drivers/clk/sunxi/clk-usb.c +Merging tegra/for-next (794345d409ad Merge branch for-3.20/arm64 into for-next) +$ git merge tegra/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (d476d94f180a arm64: compat: Remove incorrect comment in compat_siginfo) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) +$ git merge blackfin/for-linus +Auto-merging arch/blackfin/mach-bf609/boards/ezkit.c +Merge made by the 'recursive' strategy. + arch/blackfin/configs/BF518F-EZBRD_defconfig | 1 - + arch/blackfin/configs/BF527-TLL6527M_defconfig | 1 - + arch/blackfin/configs/BF533-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF533-STAMP_defconfig | 1 - + arch/blackfin/configs/BF537-STAMP_defconfig | 3 ++- + arch/blackfin/configs/BF538-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF561-ACVILON_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT_defconfig | 1 - + arch/blackfin/configs/CM-BF527_defconfig | 1 - + arch/blackfin/configs/CM-BF533_defconfig | 1 - + arch/blackfin/configs/CM-BF537E_defconfig | 1 - + arch/blackfin/configs/CM-BF537U_defconfig | 1 - + arch/blackfin/configs/CM-BF548_defconfig | 1 - + arch/blackfin/configs/CM-BF561_defconfig | 1 - + arch/blackfin/configs/DNP5370_defconfig | 1 - + arch/blackfin/configs/IP0X_defconfig | 1 - + arch/blackfin/configs/PNAV-10_defconfig | 1 - + arch/blackfin/configs/SRV1_defconfig | 1 - + arch/blackfin/configs/TCM-BF518_defconfig | 1 - + arch/blackfin/configs/TCM-BF537_defconfig | 1 - + arch/blackfin/kernel/kgdb.c | 12 ++++-------- + arch/blackfin/mach-bf609/boards/ezkit.c | 8 ++++---- + 23 files changed, 10 insertions(+), 33 deletions(-) +Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (9987c19ed9a7 CRIS: Whitespace cleanup) +$ git merge cris/for-next +Already up-to-date. +Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (a6b8978c54b7 pstore: Fix sprintf format specifier in pstore_dump()) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (4436820a98cd m68k/defconfig: Enable Ethernet bridging) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (c517d838eb7d Linux 4.0-rc1) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (a01d37d914f9 microblaze: Remove *.dtb files in make clean) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (64b139f97c01 MIPS: OCTEON: irq: add CIB and other fixes) +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging nios2/nios2-next (d16d2be111a6 nios2: add kgdb support) +$ git merge nios2/nios2-next +Already up-to-date. +Merging parisc-hd/for-next (bfa76d495765 Linux 3.19) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (d557b09800da powerpc/mm/thp: Use tlbiel if possible) +$ git merge powerpc/next +Already up-to-date. +Merging powerpc-mpe/next (a6130ed253a9 cxl: Add missing return statement after handling AFU errror) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (0dc294f717d4 powerpc/mm: bail out early when flushing TLB page) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (2aa7c23d8a9b s390/traps: panic() instead of die() on translation exception) +$ git merge s390/features +Removing arch/s390/math-emu/math.c +Removing arch/s390/math-emu/Makefile +Removing arch/s390/lib/ucmpdi2.c +Removing arch/s390/lib/qrnnd.S +Removing arch/s390/lib/mem32.S +Removing arch/s390/lib/div64.c +Removing arch/s390/kernel/relocate_kernel64.S +Removing arch/s390/kernel/reipl64.S +Removing arch/s390/kernel/head31.S +Removing arch/s390/kernel/entry64.S +Removing arch/s390/boot/compressed/head31.S +Merge made by the 'recursive' strategy. + arch/s390/Kbuild | 1 - + arch/s390/Kconfig | 79 +- + arch/s390/Makefile | 16 +- + arch/s390/boot/compressed/Makefile | 12 +- + arch/s390/boot/compressed/{head64.S => head.S} | 0 + arch/s390/boot/compressed/head31.S | 51 - + arch/s390/boot/compressed/vmlinux.lds.S | 5 - + arch/s390/crypto/crypt_s390.h | 8 +- + arch/s390/hypfs/hypfs_diag0c.c | 4 - + arch/s390/include/asm/appldata.h | 24 - + arch/s390/include/asm/atomic.h | 95 - + arch/s390/include/asm/bitops.h | 28 - + arch/s390/include/asm/cmpxchg.h | 7 +- + arch/s390/include/asm/cputime.h | 26 - + arch/s390/include/asm/ctl_reg.h | 14 +- + arch/s390/include/asm/elf.h | 4 - + arch/s390/include/asm/idals.h | 16 - + arch/s390/include/asm/jump_label.h | 12 +- + arch/s390/include/asm/lowcore.h | 159 -- + arch/s390/include/asm/mman.h | 2 +- + arch/s390/include/asm/mmu_context.h | 4 - + arch/s390/include/asm/percpu.h | 4 - + arch/s390/include/asm/perf_event.h | 3 - + arch/s390/include/asm/pgalloc.h | 24 - + arch/s390/include/asm/pgtable.h | 123 +- + arch/s390/include/asm/processor.h | 66 +- + arch/s390/include/asm/ptrace.h | 4 - + arch/s390/include/asm/qdio.h | 10 - + arch/s390/include/asm/runtime_instr.h | 10 +- + arch/s390/include/asm/rwsem.h | 81 - + arch/s390/include/asm/setup.h | 35 - + arch/s390/include/asm/sfp-util.h | 10 - + arch/s390/include/asm/sparsemem.h | 9 - + arch/s390/include/asm/switch_to.h | 21 +- + arch/s390/include/asm/thread_info.h | 9 - + arch/s390/include/asm/tlb.h | 4 - + arch/s390/include/asm/tlbflush.h | 7 - + arch/s390/include/asm/types.h | 17 - + arch/s390/include/asm/unistd.h | 8 - + arch/s390/include/asm/vdso.h | 2 - + arch/s390/kernel/Makefile | 22 +- + arch/s390/kernel/asm-offsets.c | 4 - + arch/s390/kernel/base.S | 76 - + arch/s390/kernel/cpcmd.c | 10 - + arch/s390/kernel/diag.c | 15 - + arch/s390/kernel/dis.c | 48 +- + arch/s390/kernel/dumpstack.c | 26 +- + arch/s390/kernel/early.c | 69 - + arch/s390/kernel/entry.S | 1005 ++++++----- + arch/s390/kernel/entry64.S | 1059 ----------- + arch/s390/kernel/head.S | 49 - + arch/s390/kernel/head31.S | 106 -- + arch/s390/kernel/head_kdump.S | 8 - + arch/s390/kernel/ipl.c | 2 - + arch/s390/kernel/jump_label.c | 12 +- + arch/s390/kernel/module.c | 13 +- + arch/s390/kernel/nmi.c | 92 +- + arch/s390/kernel/pgm_check.S | 22 +- + arch/s390/kernel/process.c | 29 +- + arch/s390/kernel/ptrace.c | 46 +- + arch/s390/kernel/reipl.S | 133 +- + arch/s390/kernel/reipl64.S | 155 -- + arch/s390/kernel/relocate_kernel.S | 63 +- + arch/s390/kernel/relocate_kernel64.S | 121 -- + arch/s390/kernel/sclp.S | 10 - + arch/s390/kernel/setup.c | 72 - + arch/s390/kernel/signal.c | 10 - + arch/s390/kernel/smp.c | 33 - + arch/s390/kernel/sys_s390.c | 49 - + arch/s390/kernel/syscalls.S | 716 ++++---- + arch/s390/kernel/traps.c | 155 +- + arch/s390/kernel/vdso.c | 16 +- + arch/s390/kernel/vmlinux.lds.S | 7 - + arch/s390/lib/Makefile | 3 +- + arch/s390/lib/div64.c | 147 -- + arch/s390/lib/mem32.S | 92 - + arch/s390/lib/qrnnd.S | 78 - + arch/s390/lib/uaccess.c | 136 +- + arch/s390/lib/ucmpdi2.c | 26 - + arch/s390/math-emu/Makefile | 7 - + arch/s390/math-emu/math.c | 2255 ------------------------ + arch/s390/mm/dump_pagetables.c | 24 +- + arch/s390/mm/extmem.c | 14 - + arch/s390/mm/fault.c | 36 - + arch/s390/mm/gup.c | 4 - + arch/s390/mm/init.c | 5 - + arch/s390/mm/mem_detect.c | 4 - + arch/s390/mm/mmap.c | 25 - + arch/s390/mm/pageattr.c | 2 +- + arch/s390/mm/pgtable.c | 8 - + arch/s390/mm/vmem.c | 10 +- + arch/s390/oprofile/Makefile | 2 +- + arch/s390/oprofile/init.c | 11 - + arch/s390/pci/pci.c | 3 +- + drivers/s390/block/dasd.c | 2 - + drivers/s390/block/dasd_diag.h | 42 - + drivers/s390/block/dasd_eckd.c | 6 - + drivers/s390/block/dasd_fba.c | 2 - + drivers/s390/block/scm_blk_cluster.c | 2 +- + drivers/s390/char/Kconfig | 2 +- + drivers/s390/char/sclp_sdias.c | 4 - + drivers/s390/char/zcore.c | 32 - + drivers/s390/cio/cio.c | 2 - + drivers/s390/cio/qdio.h | 7 - + drivers/s390/cio/qdio_setup.c | 3 - + drivers/s390/crypto/ap_bus.c | 24 +- + drivers/s390/net/ctcm_mpc.c | 12 - + 107 files changed, 1225 insertions(+), 7074 deletions(-) + rename arch/s390/boot/compressed/{head64.S => head.S} (100%) + delete mode 100644 arch/s390/boot/compressed/head31.S + delete mode 100644 arch/s390/kernel/entry64.S + delete mode 100644 arch/s390/kernel/head31.S + delete mode 100644 arch/s390/kernel/reipl64.S + delete mode 100644 arch/s390/kernel/relocate_kernel64.S + delete mode 100644 arch/s390/lib/div64.c + delete mode 100644 arch/s390/lib/mem32.S + delete mode 100644 arch/s390/lib/qrnnd.S + delete mode 100644 arch/s390/lib/ucmpdi2.c + delete mode 100644 arch/s390/math-emu/Makefile + delete mode 100644 arch/s390/math-emu/math.c +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (740e1433f50e tile: change MAINTAINERS website from tilera.com to ezchip.com) +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (1f2fdbd0078c xtensa: disable link optimization) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (a742994aa2e2 Btrfs: don't remove extents and xattrs when logging new names) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default) +$ git merge ceph/master +Resolved 'fs/ceph/inode.c' using previous resolution. +Resolved 'fs/ceph/snap.c' using previous resolution. +Resolved 'fs/ceph/super.c' using previous resolution. +Resolved 'fs/ceph/super.h' using previous resolution. +Resolved 'include/linux/ceph/libceph.h' using previous resolution. +Resolved 'net/ceph/auth_x.c' using previous resolution. +Resolved 'net/ceph/ceph_common.c' using previous resolution. +Auto-merging net/ceph/ceph_common.c +CONFLICT (content): Merge conflict in net/ceph/ceph_common.c +Auto-merging net/ceph/auth_x.c +CONFLICT (content): Merge conflict in net/ceph/auth_x.c +Auto-merging include/linux/ceph/libceph.h +CONFLICT (content): Merge conflict in include/linux/ceph/libceph.h +Auto-merging fs/ceph/super.h +CONFLICT (content): Merge conflict in fs/ceph/super.h +Auto-merging fs/ceph/super.c +CONFLICT (content): Merge conflict in fs/ceph/super.c +Auto-merging fs/ceph/snap.c +CONFLICT (content): Merge conflict in fs/ceph/snap.c +Auto-merging fs/ceph/inode.c +CONFLICT (content): Merge conflict in fs/ceph/inode.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b15401405964] Merge remote-tracking branch 'ceph/master' +$ git diff -M --stat --summary HEAD^.. +Merging cifs/for-next (5a090583c3fc Update negotiate protocol for SMB3.1 dialect) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 9 ++++++++ + fs/cifs/cifsglob.h | 7 ++++++ + fs/cifs/connect.c | 10 +++++++++ + fs/cifs/smb2ops.c | 25 ++++++++++++++++++++- + fs/cifs/smb2pdu.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++--- + fs/cifs/smb2pdu.h | 50 +++++++++++++++++++++++++++++++++++------- + 6 files changed, 153 insertions(+), 12 deletions(-) +Merging ecryptfs/next (e7a823be2adc Merge tag 'linux-kselftest-3.19-rc-5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (6981498d7956 udf: remove bool assignment to 0/1) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (6f30b7e37a82 ext4: fix indirect punch hole corruption) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (db3ecdee1cf0 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) +$ 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 7ca3c85d0708] Merge remote-tracking branch 'fscache/fscache' +$ git diff -M --stat --summary HEAD^.. +Merging fuse/for-next (9759bd518994 fuse: add memory barrier to INIT) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (89d4899e65a7 GFS2: Move gfs2_file_splice_write outside of #ifdef) +$ git merge gfs2/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + fs/gfs2/acl.c | 6 +----- + fs/gfs2/file.c | 20 ++++++++++++++++++-- + 3 files changed, 21 insertions(+), 9 deletions(-) +Merging jfs/jfs-next (648695c74811 jfs: Deletion of an unnecessary check before the function call "unload_nls") +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (7a27eae362ae Merge tag 'nfs-rdma-for-4.0-3' of git://git.linux-nfs.org/projects/anna/nfs-rdma) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + net/sunrpc/xprtrdma/rpc_rdma.c | 3 ++- + net/sunrpc/xprtrdma/xprt_rdma.h | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging nfsd/nfsd-next (a1d1e9be5a1d svcrpc: fix memory leak in gssp_accept_sec_context_upcall) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + net/sunrpc/auth_gss/gss_rpc_upcall.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging overlayfs/overlayfs-next (4330397e4e8a ovl: discard independent cursor in readdir()) +$ git merge overlayfs/overlayfs-next +Already up-to-date. +Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (b388e6a7a6ba UBI: fix missing brace control flow) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/eba.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging xfs/for-next (88e8fda99a4c Merge branch 'xfs-mmap-lock' into for-next) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/xfs.txt | 29 +- + fs/xfs/libxfs/xfs_alloc.c | 104 +++-- + fs/xfs/libxfs/xfs_bmap.c | 174 ++++---- + fs/xfs/libxfs/xfs_btree.c | 24 +- + fs/xfs/libxfs/xfs_dir2_data.c | 39 +- + fs/xfs/libxfs/xfs_format.h | 62 --- + fs/xfs/libxfs/xfs_ialloc.c | 48 +- + fs/xfs/libxfs/xfs_sb.c | 20 +- + fs/xfs/xfs_bmap_util.c | 31 +- + fs/xfs/xfs_buf_item.c | 4 +- + fs/xfs/xfs_discard.c | 2 +- + fs/xfs/xfs_error.h | 8 +- + fs/xfs/xfs_file.c | 84 +++- + fs/xfs/xfs_fsops.c | 20 +- + fs/xfs/xfs_icache.c | 4 +- + fs/xfs/xfs_inode.c | 154 +++++-- + fs/xfs/xfs_inode.h | 58 ++- + fs/xfs/xfs_ioctl.c | 5 +- + fs/xfs/xfs_iomap.c | 3 +- + fs/xfs/xfs_iops.c | 123 ++--- + fs/xfs/xfs_iops.h | 2 - + fs/xfs/xfs_itable.c | 2 +- + fs/xfs/xfs_linux.h | 9 - + fs/xfs/xfs_log_recover.c | 4 +- + fs/xfs/xfs_mount.c | 918 +++++--------------------------------- + fs/xfs/xfs_mount.h | 95 +--- + fs/xfs/xfs_pnfs.c | 4 +- + fs/xfs/xfs_qm.c | 18 +- + fs/xfs/xfs_super.c | 126 ++++-- + fs/xfs/xfs_super.h | 2 + + fs/xfs/xfs_symlink.c | 58 ++- + fs/xfs/xfs_trace.h | 3 + + fs/xfs/xfs_trans.c | 234 ++++++---- + 33 files changed, 925 insertions(+), 1546 deletions(-) +Merging file-locks/linux-next (b2b89ebfc0f0 Merge tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (ca160d0085b6 kill struct filename.separate) +$ git merge vfs/for-next +Merge made by the 'recursive' strategy. + fs/namei.c | 108 +++++++++++++++++++++++++---------------------------- + include/linux/fs.h | 2 +- + 2 files changed, 52 insertions(+), 58 deletions(-) +Merging pci/next (c517d838eb7d Linux 4.0-rc1) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (b14f9dc6591f Merge branch 'for-4.1/i2c-hid' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-hid | 10 + + .../ABI/testing/sysfs-driver-hid-logitech-lg4ff | 45 ++ + drivers/hid/hid-core.c | 21 + + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-kye.c | 140 +++++ + drivers/hid/hid-lg.c | 7 + + drivers/hid/hid-lg.h | 12 - + drivers/hid/hid-lg4ff.c | 600 ++++++++++++++++++--- + drivers/hid/hid-lg4ff.h | 18 + + drivers/hid/hid-rmi.c | 99 ++++ + drivers/hid/hid-sensor-hub.c | 196 ++++--- + drivers/hid/hid-sony.c | 31 +- + drivers/hid/i2c-hid/i2c-hid.c | 68 ++- + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hid/wacom_wac.c | 15 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 3 +- + .../iio/common/hid-sensors/hid-sensor-attributes.c | 24 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 13 +- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 3 +- + drivers/iio/light/hid-sensor-als.c | 3 +- + drivers/iio/light/hid-sensor-prox.c | 3 +- + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 3 +- + drivers/iio/orientation/hid-sensor-incl-3d.c | 3 +- + drivers/iio/pressure/hid-sensor-press.c | 3 +- + drivers/rtc/rtc-hid-sensor-time.c | 2 +- + include/linux/hid-sensor-hub.h | 55 +- + include/linux/hid-sensor-ids.h | 2 + + 27 files changed, 1158 insertions(+), 223 deletions(-) + create mode 100644 drivers/hid/hid-lg4ff.h +Merging i2c/i2c/for-next (c517d838eb7d Linux 4.0-rc1) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (9248faef66cd hwmon: (ibmpex) Allow format string checking) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/ads7828.c | 3 +++ + drivers/hwmon/coretemp.c | 11 +++++------ + drivers/hwmon/ibmpex.c | 19 ++++++++----------- + 3 files changed, 16 insertions(+), 17 deletions(-) +Merging v4l-dvb/master (48b777c0833b Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/usb/gspca/topro.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging kbuild/for-next (8d18d1d514d1 Merge branch 'kbuild/kconfig' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +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 (bfa76d495765 Linux 3.19) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (d85aa1624b05 Merge branch 'for-3.19-fixes' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (3a64df4a3a4d genirq / PM: better describe IRQF_NO_SUSPEND semantics) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/power/suspend-and-interrupts.txt | 6 ++++-- + include/linux/interrupt.h | 4 +++- + 2 files changed, 7 insertions(+), 3 deletions(-) +Merging idle/next (210109f4a19a Merge branches 'turbostat', 'sfi' and 'cpuidle' into release) +$ git merge idle/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging thermal/next (4531fa1684bb thermal: exynos: fix: Check if data->tmu_read callback is present before read) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (1a9f3d3782f9 Merge branch 'work-fixes' into work-next) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. + .../bindings/thermal/qcom-spmi-temp-alarm.txt | 57 ++++ + Documentation/thermal/sysfs-api.txt | 31 ++- + drivers/acpi/thermal.c | 9 +- + drivers/platform/x86/acerhdf.c | 3 +- + drivers/thermal/Kconfig | 11 + + drivers/thermal/Makefile | 1 + + drivers/thermal/db8500_thermal.c | 2 +- + drivers/thermal/fair_share.c | 41 +-- + drivers/thermal/imx_thermal.c | 3 +- + drivers/thermal/of-thermal.c | 5 +- + drivers/thermal/qcom-spmi-temp-alarm.c | 309 +++++++++++++++++++++ + drivers/thermal/rcar_thermal.c | 26 +- + drivers/thermal/samsung/exynos_tmu.c | 38 +-- + drivers/thermal/thermal_core.c | 62 ++++- + drivers/thermal/thermal_core.h | 3 + + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 2 +- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 +- + include/linux/thermal.h | 71 ++++- + 18 files changed, 590 insertions(+), 89 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt + create mode 100644 drivers/thermal/qcom-spmi-temp-alarm.c +Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (771bd4f095dd Merge branch 'fixes' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + drivers/dma/mmp_pdma.c | 3 ++ + drivers/dma/sh/shdma-base.c | 73 ++++++++++++++++++++++++++++----------- + drivers/mmc/host/sh_mmcif.c | 13 +++---- + drivers/mmc/host/sh_mobile_sdhi.c | 2 -- + drivers/mmc/host/tmio_mmc.h | 2 -- + drivers/mmc/host/tmio_mmc_dma.c | 4 --- + drivers/mtd/nand/sh_flctl.c | 2 -- + drivers/spi/spi-rspi.c | 1 - + drivers/spi/spi-sh-msiof.c | 1 - + include/linux/shdma-base.h | 1 + + sound/soc/sh/fsi.c | 18 +++++++--- + 11 files changed, 75 insertions(+), 45 deletions(-) +Merging net-next/master (92bf200881d9 net: via-rhine: add BQL support) +$ git merge net-next/master +Auto-merging net/core/skbuff.c +Auto-merging net/core/ethtool.c +Auto-merging net/compat.c +Auto-merging drivers/net/usb/hso.c +Auto-merging drivers/net/ethernet/altera/altera_tse_main.c +Auto-merging arch/powerpc/net/bpf_jit_asm.S +Merge made by the 'recursive' strategy. + Documentation/networking/pktgen.txt | 62 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/asm-compat.h | 4 + + arch/powerpc/include/asm/ppc-opcode.h | 2 + + arch/powerpc/net/Makefile | 2 +- + arch/powerpc/net/bpf_jit.h | 64 +- + arch/powerpc/net/{bpf_jit_64.S => bpf_jit_asm.S} | 70 +- + arch/powerpc/net/bpf_jit_comp.c | 46 +- + drivers/net/bonding/bond_3ad.c | 60 +- + drivers/net/bonding/bond_main.c | 6 +- + drivers/net/bonding/bond_procfs.c | 43 +- + drivers/net/dsa/mv88e6171.c | 18 +- + drivers/net/dsa/mv88e6352.c | 77 +- + drivers/net/dsa/mv88e6xxx.c | 53 ++ + drivers/net/dsa/mv88e6xxx.h | 6 + + drivers/net/ethernet/altera/altera_tse_main.c | 20 +- + drivers/net/ethernet/broadcom/Kconfig | 8 +- + drivers/net/ethernet/broadcom/bnx2.c | 14 +- + drivers/net/ethernet/broadcom/bnx2.h | 4 +- + drivers/net/ethernet/broadcom/bnx2_fw.h | 4 +- + drivers/net/ethernet/broadcom/cnic.c | 6 +- + drivers/net/ethernet/broadcom/cnic_if.h | 8 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 133 ++- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2 +- + drivers/net/ethernet/brocade/Kconfig | 8 +- + drivers/net/ethernet/brocade/Makefile | 2 +- + drivers/net/ethernet/brocade/bna/Kconfig | 12 +- + drivers/net/ethernet/brocade/bna/Makefile | 3 +- + drivers/net/ethernet/brocade/bna/bfa_cee.c | 7 +- + drivers/net/ethernet/brocade/bna/bfa_cee.h | 7 +- + drivers/net/ethernet/brocade/bna/bfa_cs.h | 7 +- + drivers/net/ethernet/brocade/bna/bfa_defs.h | 7 +- + drivers/net/ethernet/brocade/bna/bfa_defs_cna.h | 7 +- + .../net/ethernet/brocade/bna/bfa_defs_mfg_comm.h | 7 +- + drivers/net/ethernet/brocade/bna/bfa_defs_status.h | 7 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 9 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.h | 7 +- + drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c | 7 +- + drivers/net/ethernet/brocade/bna/bfa_msgq.c | 7 +- + drivers/net/ethernet/brocade/bna/bfa_msgq.h | 7 +- + drivers/net/ethernet/brocade/bna/bfi.h | 7 +- + drivers/net/ethernet/brocade/bna/bfi_cna.h | 7 +- + drivers/net/ethernet/brocade/bna/bfi_enet.h | 7 +- + drivers/net/ethernet/brocade/bna/bfi_reg.h | 13 +- + drivers/net/ethernet/brocade/bna/bna.h | 7 +- + drivers/net/ethernet/brocade/bna/bna_enet.c | 7 +- + drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 7 +- + drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 7 +- + drivers/net/ethernet/brocade/bna/bna_types.h | 7 +- + drivers/net/ethernet/brocade/bna/bnad.c | 11 +- + drivers/net/ethernet/brocade/bna/bnad.h | 9 +- + drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 7 +- + drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 7 +- + drivers/net/ethernet/brocade/bna/cna.h | 11 +- + drivers/net/ethernet/brocade/bna/cna_fwimg.c | 7 +- + drivers/net/ethernet/cadence/macb.c | 18 +- + drivers/net/ethernet/cadence/macb.h | 15 +- + drivers/net/ethernet/emulex/benet/be.h | 43 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 85 +- + drivers/net/ethernet/emulex/benet/be_main.c | 979 +++++++++++---------- + drivers/net/ethernet/intel/e1000e/defines.h | 1 + + drivers/net/ethernet/intel/e1000e/e1000.h | 2 + + drivers/net/ethernet/intel/e1000e/ethtool.c | 6 +- + drivers/net/ethernet/intel/e1000e/hw.h | 6 + + drivers/net/ethernet/intel/e1000e/ich8lan.c | 770 ++++++++++++++-- + drivers/net/ethernet/intel/e1000e/ich8lan.h | 9 + + drivers/net/ethernet/intel/e1000e/netdev.c | 50 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 4 +- + drivers/net/ethernet/intel/e1000e/regs.h | 3 + + drivers/net/ethernet/intel/i40e/i40e.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_common.c | 33 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 14 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 5 +- + drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 50 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 96 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 3 - + drivers/net/ethernet/intel/i40e/i40e_register.h | 50 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 419 ++++++--- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 17 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 42 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 +- + drivers/net/ethernet/intel/i40evf/i40e_register.h | 50 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 401 ++++++--- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 17 +- + drivers/net/ethernet/intel/i40evf/i40e_type.h | 1 - + drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 42 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 63 +- + drivers/net/ethernet/intel/igbvf/defines.h | 128 ++- + drivers/net/ethernet/intel/igbvf/ethtool.c | 83 +- + drivers/net/ethernet/intel/igbvf/igbvf.h | 103 +-- + drivers/net/ethernet/intel/igbvf/mbx.c | 21 +- + drivers/net/ethernet/intel/igbvf/mbx.h | 53 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 391 ++++---- + drivers/net/ethernet/intel/igbvf/regs.h | 123 ++- + drivers/net/ethernet/intel/igbvf/vf.c | 43 +- + drivers/net/ethernet/intel/igbvf/vf.h | 83 +- + drivers/net/ethernet/sun/sunvnet.c | 2 + + drivers/net/ethernet/via/via-rhine.c | 29 +- + drivers/net/usb/hso.c | 13 +- + drivers/net/usb/r8152.c | 131 ++- + include/linux/igmp.h | 2 + + include/linux/skbuff.h | 3 +- + include/net/bond_3ad.h | 29 + + net/batman-adv/gateway_client.c | 19 +- + net/bridge/br_netlink.c | 46 +- + net/compat.c | 10 +- + net/core/ethtool.c | 2 +- + net/core/skbuff.c | 9 +- + net/ipv4/igmp.c | 52 +- + net/ipv4/tcp_cong.c | 2 +- + net/ipv6/ip6_tunnel.c | 6 - + net/ipv6/raw.c | 2 +- + net/netfilter/nf_conntrack_amanda.c | 10 +- + net/netfilter/xt_string.c | 3 +- + net/sched/em_text.c | 3 +- + samples/pktgen/pktgen.conf-1-1 | 59 ++ + samples/pktgen/pktgen.conf-1-1-flows | 67 ++ + samples/pktgen/pktgen.conf-1-1-ip6 | 60 ++ + samples/pktgen/pktgen.conf-1-1-ip6-rdos | 63 ++ + samples/pktgen/pktgen.conf-1-1-rdos | 64 ++ + samples/pktgen/pktgen.conf-1-2 | 69 ++ + samples/pktgen/pktgen.conf-2-1 | 66 ++ + samples/pktgen/pktgen.conf-2-2 | 73 ++ + 125 files changed, 4077 insertions(+), 2092 deletions(-) + rename arch/powerpc/net/{bpf_jit_64.S => bpf_jit_asm.S} (76%) + create mode 100755 samples/pktgen/pktgen.conf-1-1 + create mode 100755 samples/pktgen/pktgen.conf-1-1-flows + create mode 100755 samples/pktgen/pktgen.conf-1-1-ip6 + create mode 100755 samples/pktgen/pktgen.conf-1-1-ip6-rdos + create mode 100755 samples/pktgen/pktgen.conf-1-1-rdos + create mode 100755 samples/pktgen/pktgen.conf-1-2 + create mode 100755 samples/pktgen/pktgen.conf-2-1 + create mode 100755 samples/pktgen/pktgen.conf-2-2 +Merging ipsec-next/master (ff660f75be36 Merge branch 'stmmac-pci') +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-drivers-next/master (d53071143aa5 Merge ath-next from ath.git) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (03f310efd4b1 Bluetooth: Remove unnecessary queue_monitor_skb() function) +$ git merge bluetooth/master +Auto-merging drivers/bluetooth/btusb.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/ath3k.c | 1 + + drivers/bluetooth/btmrvl_drv.h | 1 + + drivers/bluetooth/btmrvl_main.c | 14 +++ + drivers/bluetooth/btusb.c | 120 ++++++++++++------ + drivers/net/ieee802154/at86rf230.c | 2 +- + include/linux/ieee802154.h | 12 +- + include/net/bluetooth/hci_core.h | 144 ++++++++-------------- + include/net/mac802154.h | 9 +- + net/6lowpan/Kconfig | 57 ++++++++- + net/6lowpan/Makefile | 13 +- + net/6lowpan/iphc.c | 200 +++++------------------------- + net/6lowpan/nhc.c | 241 +++++++++++++++++++++++++++++++++++++ + net/6lowpan/nhc.h | 146 ++++++++++++++++++++++ + net/6lowpan/nhc_dest.c | 28 +++++ + net/6lowpan/nhc_fragment.c | 27 +++++ + net/6lowpan/nhc_hop.c | 27 +++++ + net/6lowpan/nhc_ipv6.c | 27 +++++ + net/6lowpan/nhc_mobility.c | 27 +++++ + net/6lowpan/nhc_routing.c | 27 +++++ + net/6lowpan/nhc_udp.c | 157 ++++++++++++++++++++++++ + net/bluetooth/Kconfig | 8 ++ + net/bluetooth/Makefile | 3 +- + net/bluetooth/a2mp.c | 44 +++---- + net/bluetooth/a2mp.h | 8 -- + net/bluetooth/hci_conn.c | 20 ++- + net/bluetooth/hci_core.c | 48 +++++--- + net/bluetooth/hci_debugfs.h | 22 ++++ + net/bluetooth/hci_event.c | 38 +++--- + net/bluetooth/hci_sock.c | 41 ++----- + net/bluetooth/l2cap_core.c | 40 +++++- + net/bluetooth/mgmt.c | 16 ++- + net/bluetooth/sco.c | 21 +++- + net/bluetooth/smp.c | 24 ++-- + net/ieee802154/6lowpan/core.c | 6 +- + net/ieee802154/core.c | 1 + + 35 files changed, 1174 insertions(+), 446 deletions(-) + create mode 100644 net/6lowpan/nhc.c + create mode 100644 net/6lowpan/nhc.h + create mode 100644 net/6lowpan/nhc_dest.c + create mode 100644 net/6lowpan/nhc_fragment.c + create mode 100644 net/6lowpan/nhc_hop.c + create mode 100644 net/6lowpan/nhc_ipv6.c + create mode 100644 net/6lowpan/nhc_mobility.c + create mode 100644 net/6lowpan/nhc_routing.c + create mode 100644 net/6lowpan/nhc_udp.c +Merging infiniband/for-next (147d1da951cf Merge branches 'core', 'cxgb4', 'iser', 'mlx4', 'mlx5', 'ocrdma', 'odp', 'qib' and 'srp' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (c517d838eb7d Linux 4.0-rc1) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (d6a3f0176fe0 mtd: block2mtd: wait until block devices are presented) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/devices/block2mtd.c | 58 ++++++++++++++++++++++++++++++----------- + 1 file changed, 43 insertions(+), 15 deletions(-) +Merging crypto/master (db71f29a1c32 crypto: testmgr - mark rfc4106(gcm(aes)) as fips_allowed) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (45ee2dbc65cb Merge branch 'drm-next-3.20' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (23923ebaac52 drm: Remove unused DRM_MODE_OBJECT_BRIDGE) +$ git merge drm-panel/drm/panel/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/bridge/Kconfig | 11 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/ps8622.c | 684 +++++++++++++++++++++++++++++++++++++++ + drivers/gpu/drm/bridge/ptn3460.c | 2 +- + include/drm/drm_crtc.h | 1 - + 5 files changed, 697 insertions(+), 2 deletions(-) + create mode 100644 drivers/gpu/drm/bridge/ps8622.c +Merging drm-intel/for-linux-next (80958155d684 drm/i915/skl: Make sure to allocate mininum sizes in the DDB) +$ git merge drm-intel/for-linux-next +Recorded preimage for 'drivers/gpu/drm/i915/intel_display.c' +Auto-merging include/uapi/drm/drm_fourcc.h +Auto-merging include/drm/i915_pciids.h +Auto-merging include/drm/drm_crtc.h +Auto-merging drivers/gpu/drm/i915/intel_uncore.c +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Removing drivers/gpu/drm/i915/intel_dsi_cmd.h +Auto-merging drivers/gpu/drm/i915/intel_dsi.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gem_stolen.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/drm_irq.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/intel_display.c'. +[master 144bcd022952] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/drm.tmpl | 16 ++ + drivers/gpu/drm/drm_crtc.c | 14 +- + drivers/gpu/drm/drm_crtc_helper.c | 1 + + drivers/gpu/drm/drm_ioctl.c | 3 + + drivers/gpu/drm/drm_irq.c | 56 +++++- + drivers/gpu/drm/i915/Makefile | 3 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 74 ++++--- + drivers/gpu/drm/i915/i915_debugfs.c | 98 ++++++++- + drivers/gpu/drm/i915/i915_dma.c | 92 +++++++++ + drivers/gpu/drm/i915/i915_drv.c | 21 +- + drivers/gpu/drm/i915/i915_drv.h | 50 +++-- + drivers/gpu/drm/i915/i915_gem.c | 9 + + drivers/gpu/drm/i915/i915_gem_context.c | 12 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 74 +++---- + drivers/gpu/drm/i915/i915_gem_gtt.c | 44 +++- + drivers/gpu/drm/i915/i915_gem_gtt.h | 8 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 8 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 5 +- + drivers/gpu/drm/i915/i915_irq.c | 93 ++------- + drivers/gpu/drm/i915/i915_reg.h | 110 +++++++++- + drivers/gpu/drm/i915/i915_sysfs.c | 10 +- + drivers/gpu/drm/i915/i915_trace.h | 8 +- + drivers/gpu/drm/i915/i915_vgpu.c | 264 ++++++++++++++++++++++++ + drivers/gpu/drm/i915/i915_vgpu.h | 91 +++++++++ + drivers/gpu/drm/i915/intel_display.c | 310 ++++++++++++++++------------- + drivers/gpu/drm/i915/intel_dp.c | 127 +++++++++++- + drivers/gpu/drm/i915/intel_drv.h | 40 ++-- + drivers/gpu/drm/i915/intel_dsi.c | 2 +- + drivers/gpu/drm/i915/intel_dsi_cmd.h | 39 ---- + drivers/gpu/drm/i915/intel_fbc.c | 93 +++++---- + drivers/gpu/drm/i915/intel_fbdev.c | 3 +- + drivers/gpu/drm/i915/intel_lrc.c | 175 ++++++++++++---- + drivers/gpu/drm/i915/intel_lrc.h | 10 +- + drivers/gpu/drm/i915/intel_pm.c | 136 ++++++++----- + drivers/gpu/drm/i915/intel_ringbuffer.c | 268 ++++++++++++++++++------- + drivers/gpu/drm/i915/intel_ringbuffer.h | 8 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 220 ++++++++++++++++++++ + drivers/gpu/drm/i915/intel_sprite.c | 23 +-- + drivers/gpu/drm/i915/intel_uncore.c | 59 +++++- + include/drm/drmP.h | 1 + + include/drm/drm_crtc.h | 4 + + include/drm/i915_pciids.h | 28 ++- + include/uapi/drm/drm.h | 1 + + include/uapi/drm/drm_fourcc.h | 63 ++++++ + include/uapi/drm/drm_mode.h | 9 + + 45 files changed, 2108 insertions(+), 675 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_vgpu.c + create mode 100644 drivers/gpu/drm/i915/i915_vgpu.h + delete mode 100644 drivers/gpu/drm/i915/intel_dsi_cmd.h +Merging drm-tegra/drm/tegra/for-next (07d05cbf60ed drm/tegra: dc: Move more code into ->init()) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/dc.c | 79 ++++++++++++++++++++++---------------------- + drivers/gpu/drm/tegra/hdmi.c | 8 +++++ + 2 files changed, 48 insertions(+), 39 deletions(-) +Merging drm-misc/topic/drm-misc (e045d20bef41 drm: Adding edp1.4 specific dpcd macros) +$ git merge drm-misc/topic/drm-misc +Auto-merging include/drm/drmP.h +Auto-merging drivers/gpu/drm/drm_irq.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_atomic.c | 100 ++++++++++--------- + drivers/gpu/drm/drm_atomic_helper.c | 192 +++++++++++++++++++----------------- + drivers/gpu/drm/drm_crtc.c | 25 +++-- + drivers/gpu/drm/drm_irq.c | 2 +- + drivers/gpu/drm/i915/intel_atomic.c | 4 +- + drivers/gpu/drm/msm/msm_atomic.c | 4 +- + drivers/gpu/drm/tegra/drm.c | 4 +- + include/drm/drmP.h | 9 ++ + include/drm/drm_atomic_helper.h | 6 +- + include/drm/drm_crtc_helper.h | 3 +- + include/drm/drm_dp_helper.h | 8 ++ + include/drm/drm_modes.h | 2 +- + 12 files changed, 202 insertions(+), 157 deletions(-) +Merging sound/for-next (72f770c6acde Merge branch 'topic/timestamp' into for-next) +$ git merge sound/for-next +Removing sound/pci/hda/hda_priv.h +Auto-merging sound/pci/hda/hda_controller.c +Auto-merging sound/core/pcm_native.c +Merge made by the 'recursive' strategy. + Documentation/sound/alsa/timestamping.txt | 200 +++++++++++ + include/sound/pcm.h | 66 +++- + include/sound/seq_device.h | 46 ++- + include/sound/seq_kernel.h | 6 +- + include/uapi/sound/asequencer.h | 1 + + include/uapi/sound/asound.h | 39 +- + include/uapi/sound/emu10k1.h | 3 +- + include/uapi/sound/hdspm.h | 6 + + sound/core/pcm.c | 92 +++-- + sound/core/pcm_compat.c | 28 +- + sound/core/pcm_lib.c | 88 +++-- + sound/core/pcm_native.c | 41 ++- + sound/core/seq/oss/seq_oss.c | 22 +- + sound/core/seq/oss/seq_oss_synth.c | 6 +- + sound/core/seq/oss/seq_oss_synth.h | 4 +- + sound/core/seq/seq_device.c | 569 +++++++----------------------- + sound/core/seq/seq_dummy.c | 6 +- + sound/core/seq/seq_midi.c | 36 +- + sound/core/sound.c | 14 +- + sound/drivers/opl3/opl3_seq.c | 34 +- + sound/drivers/opl4/opl4_seq.c | 33 +- + sound/isa/sb/emu8000_synth.c | 35 +- + sound/pci/emu10k1/emu10k1_synth.c | 35 +- + sound/pci/hda/hda_codec.c | 87 ++--- + sound/pci/hda/hda_codec.h | 22 +- + sound/pci/hda/hda_controller.c | 136 ++++--- + sound/pci/hda/hda_controller.h | 397 ++++++++++++++++++++- + sound/pci/hda/hda_i915.c | 2 +- + sound/pci/hda/hda_intel.c | 23 +- + sound/pci/hda/hda_intel.h | 2 +- + sound/pci/hda/hda_local.h | 17 - + sound/pci/hda/hda_priv.h | 406 --------------------- + sound/pci/hda/hda_tegra.c | 9 +- + sound/pci/rme9652/hdspm.c | 141 ++------ + 34 files changed, 1285 insertions(+), 1367 deletions(-) + create mode 100644 Documentation/sound/alsa/timestamping.txt + delete mode 100644 sound/pci/hda/hda_priv.h +Merging sound-asoc/for-next (0179015b2c7f Merge remote-tracking branches 'asoc/topic/rt5677', 'asoc/topic/tegra', 'asoc/topic/wm-adsp' and 'asoc/topic/wm8804' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../bindings/sound/nvidia,tegra-audio-max98090.txt | 1 + + drivers/spi/spidev.c | 28 +- + include/sound/pcm_params.h | 7 + + include/sound/soc.h | 8 + + sound/soc/atmel/atmel_ssc_dai.c | 111 +++++++- + sound/soc/atmel/atmel_ssc_dai.h | 1 + + sound/soc/cirrus/Kconfig | 2 +- + sound/soc/codecs/Kconfig | 20 +- + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/adau1977.c | 17 +- + sound/soc/codecs/cs35l32.c | 19 +- + sound/soc/codecs/cs4265.c | 19 +- + sound/soc/codecs/max98357a.c | 23 +- + sound/soc/codecs/pcm512x.c | 178 +++++++++++-- + sound/soc/codecs/rt286.c | 17 +- + sound/soc/codecs/rt5670.c | 7 +- + sound/soc/codecs/rt5670.h | 3 + + sound/soc/codecs/rt5677.c | 28 +- + sound/soc/codecs/rt5677.h | 6 + + sound/soc/codecs/sta32x.c | 6 +- + sound/soc/codecs/sta350.c | 30 +-- + sound/soc/codecs/tas2552.c | 13 +- + sound/soc/codecs/wm8804-i2c.c | 64 +++++ + sound/soc/codecs/wm8804-spi.c | 56 ++++ + sound/soc/codecs/wm8804.c | 281 ++++++--------------- + sound/soc/codecs/wm8804.h | 7 + + sound/soc/codecs/wm_adsp.c | 13 +- + sound/soc/davinci/davinci-mcasp.c | 12 + + sound/soc/fsl/fsl-asoc-card.c | 6 + + sound/soc/fsl/fsl_ssi.c | 11 +- + sound/soc/intel/broadwell.c | 4 +- + sound/soc/intel/bytcr_dpcm_rt5640.c | 4 +- + sound/soc/intel/cht_bsw_rt5645.c | 4 +- + sound/soc/intel/cht_bsw_rt5672.c | 9 +- + sound/soc/intel/haswell.c | 4 +- + sound/soc/intel/sst-atom-controls.h | 2 +- + sound/soc/intel/sst-mfld-platform-pcm.c | 60 +++++ + sound/soc/intel/sst-mfld-platform.h | 1 + + sound/soc/intel/sst/sst.c | 138 +++++++++- + sound/soc/intel/sst/sst.h | 12 + + sound/soc/intel/sst/sst_drv_interface.c | 58 ++++- + sound/soc/intel/sst/sst_loader.c | 10 +- + sound/soc/omap/Kconfig | 4 +- + sound/soc/omap/omap-hdmi-audio.c | 3 + + sound/soc/samsung/Kconfig | 10 +- + sound/soc/sh/rcar/core.c | 4 +- + sound/soc/soc-core.c | 16 +- + sound/soc/soc-pcm.c | 1 + + sound/soc/tegra/tegra_max98090.c | 4 + + 49 files changed, 961 insertions(+), 385 deletions(-) + create mode 100644 sound/soc/codecs/wm8804-i2c.c + create mode 100644 sound/soc/codecs/wm8804-spi.c +Merging modules/modules-next (9cc019b8c94f module: Replace over-engineered nested sleep) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (5b40a7daf518 virtio: don't set VIRTIO_CONFIG_S_DRIVER_OK twice.) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (290b799c390d Input: psmouse - use IS_ENABLED instead of homegrown code) +$ git merge input/next +Already up-to-date. +Merging block/for-next (434c26478166 Merge branch 'for-3.20/core' into for-next) +$ git merge block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (9068f2f15d5f dm: only run the queue on completion if congested or no requests pending) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + block/blk-core.c | 5 +- + drivers/md/dm-cache-policy-mq.c | 251 +++++++++++++++++++++++++++---------- + drivers/md/dm-log-userspace-base.c | 84 +++++++------ + drivers/md/dm-mpath.c | 2 +- + drivers/md/dm-table.c | 14 --- + drivers/md/dm.c | 64 ++++------ + drivers/md/dm.h | 1 - + include/linux/blkdev.h | 2 - + include/linux/device-mapper.h | 5 - + 9 files changed, 254 insertions(+), 174 deletions(-) +Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) +$ git merge mmc/mmc-next +Already up-to-date. +Merging mmc-uh/next (802ea9d8645d Merge tag 'dm-3.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) +$ git merge mmc-uh/next +Already up-to-date. +Merging kgdb/kgdb-next (dd8f30cc0550 kgdb, docs: Fix <para> pdfdocs build errors) +$ git merge kgdb/kgdb-next +Already up-to-date. +Merging md/for-next (26ac107378c4 md/raid5: Fix livelock when array is both resyncing and degraded.) +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-mfd-next (0a65fbf64dad mfd: intel_soc_pmic: Add missing error check for devm_kzalloc) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (1926469377bb backlight: da9052_bl: Terminate da9052_wled_ids array with empty element) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/88pm860x_bl.c | 5 +---- + drivers/video/backlight/da9052_bl.c | 1 + + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging battery/master (9e23e22cd61a power: ltc2941-battery-gauge: Fix typo in conversion formula (58 instead of 85)) +$ git merge battery/master +Merge made by the 'recursive' strategy. + drivers/power/ltc2941-battery-gauge.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging omap_dss2/for-next (d6c2152b3efd Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (224c7f4452a2 Merge remote-tracking branches 'regulator/topic/load-op' and 'regulator/topic/wm8350' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/arizona-ldo1.c | 5 +++-- + drivers/regulator/arizona-micsupp.c | 5 +++-- + drivers/regulator/core.c | 39 +++++++++++++++++++++------------- + drivers/regulator/da9210-regulator.c | 9 ++++++++ + drivers/regulator/da9211-regulator.c | 8 +++---- + drivers/regulator/dbx500-prcmu.c | 32 ++++++++-------------------- + drivers/regulator/qcom_rpm-regulator.c | 30 ++++++++++++++++++++++++++ + drivers/regulator/rk808-regulator.c | 8 +++++++ + drivers/regulator/wm8350-regulator.c | 4 ++-- + include/linux/regulator/consumer.h | 2 +- + include/linux/regulator/driver.h | 3 +++ + 11 files changed, 95 insertions(+), 50 deletions(-) +Merging security/next (04f81f0154e4 cipso: don't use IPCB() to locate the CIPSO IP option) +$ git merge security/next +Already up-to-date. +Merging integrity/next (7bea7ff67e0c ima: /proc/keys is now mandatory) +$ git merge integrity/next +Merge made by the 'recursive' strategy. +Merging selinux/next (387fb779789d selinux: reconcile security_netlbl_secattr_to_sid() and mls_import_netlbl_cat()) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/ss/mls.c | 10 +++------- + security/selinux/ss/services.c | 6 +----- + 2 files changed, 4 insertions(+), 12 deletions(-) +Merging lblnet/next (b2776bf7149b Linux 3.18) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (c517d838eb7d Linux 4.0-rc1) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (a20cc76b9efa Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', '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 (6140a8f56238 vfio-pci: Add device request interface) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (52e68924dfa8 Documentation: Fix the wrong command `echo -1 > set_ftrace_pid` for cleaning the filter.) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (edb0ec0725bb kexec, Kconfig: spell "architecture" properly) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (5b28255278dd audit: reduce mmap_sem hold for mm->exe_file) +$ git merge audit/next +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit_tree.c +Auto-merging kernel/audit.h +Auto-merging kernel/audit.c +Merge made by the 'recursive' strategy. + kernel/audit.c | 42 ++++++++++++++++--------- + kernel/audit.h | 3 ++ + kernel/audit_tree.c | 88 ++++++++++++++++++++++++++++++++++++----------------- + kernel/auditsc.c | 9 +----- + 4 files changed, 92 insertions(+), 50 deletions(-) +Merging devicetree/devicetree/next (fca8ba4ee24d of/unittest: Remove obsolete code) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (3c3c8e3618b0 Merge remote-tracking branch 'grant/devicetree/next' into for-next) +$ 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 (a12329cfd181 Merge remote-tracking branches 'spi/topic/bcm53xx', 'spi/topic/dw', 'spi/topic/s3c64xx', 'spi/topic/sc18is602' and 'spi/topic/spidev' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/spi-bcm53xx.c | 4 ++-- + drivers/spi/spi-dw-pci.c | 4 ++-- + drivers/spi/spi-dw.c | 26 +++++++++++--------------- + drivers/spi/spi-s3c64xx.c | 4 ++-- + drivers/spi/spi-sc18is602.c | 2 +- + drivers/spi/spi-ti-qspi.c | 22 ++++++++++++++++++++++ + 6 files changed, 40 insertions(+), 22 deletions(-) +Merging tip/auto-latest (d0a45fc13f16 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging include/linux/interrupt.h +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + Documentation/acpi/apei/einj.txt | 196 ++++--- + arch/powerpc/perf/core-book3s.c | 13 +- + arch/x86/Kconfig | 21 +- + arch/x86/boot/compressed/head_32.S | 3 +- + arch/x86/boot/compressed/head_64.S | 3 +- + arch/x86/boot/video-mode.c | 4 +- + arch/x86/boot/video.c | 2 + + arch/x86/boot/video.h | 1 - + arch/x86/configs/i386_defconfig | 2 +- + arch/x86/configs/x86_64_defconfig | 2 +- + arch/x86/include/asm/cpufeature.h | 1 + + arch/x86/include/asm/fpu-internal.h | 82 ++- + arch/x86/include/asm/insn.h | 2 +- + arch/x86/include/asm/mce.h | 8 +- + arch/x86/include/asm/special_insns.h | 10 + + arch/x86/kernel/cpu/intel.c | 4 +- + arch/x86/kernel/cpu/mcheck/mce-internal.h | 9 +- + arch/x86/kernel/cpu/mcheck/mce.c | 90 +-- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 11 +- + arch/x86/kernel/cpu/mcheck/mce_intel.c | 63 ++- + arch/x86/kernel/cpu/mkcapflags.sh | 2 +- + arch/x86/kernel/cpu/perf_event.c | 71 +-- + arch/x86/kernel/cpu/perf_event.h | 20 +- + arch/x86/kernel/cpu/perf_event_amd_ibs.c | 12 +- + arch/x86/kernel/cpu/perf_event_intel.c | 36 +- + arch/x86/kernel/cpu/perf_event_intel_lbr.c | 307 +++++++--- + .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 3 +- + arch/x86/kernel/devicetree.c | 4 +- + arch/x86/kernel/e820.c | 2 +- + arch/x86/kernel/head_32.S | 3 +- + arch/x86/kernel/head_64.S | 4 +- + arch/x86/kernel/i387.c | 13 +- + arch/x86/kernel/kprobes/core.c | 54 +- + arch/x86/kernel/kprobes/opt.c | 2 + + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/setup.c | 8 +- + arch/x86/kernel/traps.c | 2 +- + arch/x86/lib/insn.c | 13 + + arch/x86/lib/x86-opcode-map.txt | 9 + + arch/x86/mm/init.c | 3 +- + arch/x86/mm/pat.c | 6 +- + arch/x86/mm/pgtable.c | 81 ++- + arch/x86/platform/efi/efi-bgrt.c | 4 +- + arch/x86/platform/intel-mid/intel-mid.c | 2 +- + include/linux/clockchips.h | 21 +- + include/linux/hardirq.h | 2 +- + include/linux/interrupt.h | 1 + + include/linux/irqflags.h | 43 +- + include/linux/perf_event.h | 20 +- + include/linux/seqlock.h | 6 +- + include/uapi/linux/perf_event.h | 49 +- + kernel/events/core.c | 191 ++++--- + kernel/futex.c | 2 +- + kernel/irq/manage.c | 36 +- + kernel/locking/mcs_spinlock.h | 6 +- + kernel/locking/mutex.c | 57 +- + kernel/locking/osq_lock.c | 14 +- + kernel/locking/rwsem-spinlock.c | 7 + + kernel/locking/rwsem-xadd.c | 71 ++- + kernel/locking/rwsem.c | 22 +- + kernel/locking/rwsem.h | 20 + + kernel/sched/core.c | 17 + + kernel/sched/fair.c | 43 +- + kernel/time/clockevents.c | 88 ++- + kernel/time/timer_list.c | 32 +- + lib/lockref.c | 2 +- + tools/build/Build.include | 81 +++ + tools/build/Documentation/Build.txt | 139 +++++ + tools/build/Makefile.build | 130 +++++ + tools/build/tests/ex/Build | 8 + + tools/build/tests/ex/Makefile | 23 + + tools/build/tests/ex/a.c | 5 + + tools/build/tests/ex/arch/Build | 2 + + tools/build/tests/ex/arch/e.c | 5 + + tools/build/tests/ex/arch/f.c | 5 + + tools/build/tests/ex/b.c | 5 + + tools/build/tests/ex/c.c | 5 + + tools/build/tests/ex/d.c | 5 + + tools/build/tests/ex/empty/Build | 0 + tools/build/tests/ex/ex.c | 19 + + tools/build/tests/run.sh | 42 ++ + tools/lib/api/Build | 2 + + tools/lib/api/Makefile | 58 +- + tools/lib/api/fd/Build | 1 + + tools/lib/api/fs/Build | 4 + + tools/lib/api/fs/debugfs.c | 69 +-- + tools/lib/api/fs/debugfs.h | 13 +- + tools/lib/api/fs/findfs.c | 63 +++ + tools/lib/api/fs/findfs.h | 23 + + tools/lib/api/fs/tracefs.c | 78 +++ + tools/lib/api/fs/tracefs.h | 21 + + tools/lib/lockdep/Build | 1 + + tools/lib/lockdep/Makefile | 132 +---- + tools/lib/traceevent/Build | 17 + + tools/lib/traceevent/Makefile | 169 ++---- + tools/lib/traceevent/event-parse.h | 2 + + tools/lib/traceevent/trace-seq.c | 13 +- + tools/perf/Build | 43 ++ + tools/perf/Documentation/Build.txt | 49 ++ + tools/perf/Documentation/perf-probe.txt | 16 +- + tools/perf/Documentation/perf-record.txt | 8 +- + tools/perf/MANIFEST | 1 + + tools/perf/Makefile.perf | 616 +++------------------ + tools/perf/arch/Build | 2 + + tools/perf/arch/arm/Build | 2 + + tools/perf/arch/arm/Makefile | 11 - + tools/perf/arch/arm/tests/Build | 2 + + tools/perf/arch/arm/util/Build | 4 + + tools/perf/arch/arm64/Build | 1 + + tools/perf/arch/arm64/Makefile | 4 - + tools/perf/arch/arm64/util/Build | 2 + + tools/perf/arch/powerpc/Build | 1 + + tools/perf/arch/powerpc/Makefile | 3 - + tools/perf/arch/powerpc/util/Build | 4 + + tools/perf/arch/s390/Build | 1 + + tools/perf/arch/s390/Makefile | 3 - + tools/perf/arch/s390/util/Build | 4 + + tools/perf/arch/sh/Build | 1 + + tools/perf/arch/sh/Makefile | 1 - + tools/perf/arch/sh/util/Build | 1 + + tools/perf/arch/sparc/Build | 1 + + tools/perf/arch/sparc/Makefile | 1 - + tools/perf/arch/sparc/util/Build | 1 + + tools/perf/arch/x86/Build | 2 + + tools/perf/arch/x86/Makefile | 15 - + tools/perf/arch/x86/tests/Build | 2 + + tools/perf/arch/x86/util/Build | 8 + + tools/perf/bench/Build | 11 + + tools/perf/builtin-buildid-cache.c | 37 +- + tools/perf/builtin-list.c | 3 + + tools/perf/builtin-record.c | 6 +- + tools/perf/builtin-report.c | 2 + + tools/perf/builtin-trace.c | 90 ++- + tools/perf/config/Makefile | 41 ++ + tools/perf/config/feature-checks/Makefile | 2 +- + tools/perf/scripts/Build | 2 + + tools/perf/scripts/perl/Perf-Trace-Util/Build | 3 + + tools/perf/scripts/python/Perf-Trace-Util/Build | 3 + + tools/perf/tests/Build | 42 ++ + tools/perf/tests/dso-data.c | 22 +- + tools/perf/tests/open-syscall-all-cpus.c | 7 +- + tools/perf/tests/open-syscall.c | 7 +- + tools/perf/tests/parse-events.c | 13 +- + tools/perf/ui/Build | 14 + + tools/perf/ui/browsers/Build | 10 + + tools/perf/ui/gtk/Build | 9 + + tools/perf/ui/tui/Build | 4 + + tools/perf/util/Build | 142 +++++ + tools/perf/util/build-id.c | 96 ++-- + tools/perf/util/build-id.h | 4 +- + tools/perf/util/cache.h | 1 + + tools/perf/util/callchain.c | 8 + + tools/perf/util/callchain.h | 1 + + tools/perf/util/dso.c | 8 +- + tools/perf/util/dwarf-aux.c | 15 + + tools/perf/util/dwarf-aux.h | 3 + + tools/perf/util/evlist.c | 3 +- + tools/perf/util/evsel.c | 21 +- + tools/perf/util/evsel.h | 4 + + tools/perf/util/machine.c | 102 +++- + tools/perf/util/parse-events.c | 24 - + tools/perf/util/parse-events.h | 2 +- + tools/perf/util/parse-options.c | 6 +- + tools/perf/util/probe-event.c | 24 +- + tools/perf/util/probe-finder.c | 12 +- + tools/perf/util/python-ext-sources | 1 - + tools/perf/util/scripting-engines/Build | 6 + + tools/perf/util/session.c | 64 ++- + tools/perf/util/setup.py | 2 +- + tools/perf/util/symbol-elf.c | 11 +- + tools/perf/util/trace-event-parse.c | 12 +- + tools/perf/util/trace-event.h | 3 + + tools/perf/util/util.c | 60 +- + tools/perf/util/util.h | 1 + + 174 files changed, 3132 insertions(+), 1722 deletions(-) + create mode 100644 kernel/locking/rwsem.h + create mode 100644 tools/build/Build.include + create mode 100644 tools/build/Documentation/Build.txt + create mode 100644 tools/build/Makefile.build + create mode 100644 tools/build/tests/ex/Build + create mode 100644 tools/build/tests/ex/Makefile + create mode 100644 tools/build/tests/ex/a.c + create mode 100644 tools/build/tests/ex/arch/Build + create mode 100644 tools/build/tests/ex/arch/e.c + create mode 100644 tools/build/tests/ex/arch/f.c + create mode 100644 tools/build/tests/ex/b.c + create mode 100644 tools/build/tests/ex/c.c + create mode 100644 tools/build/tests/ex/d.c + create mode 100644 tools/build/tests/ex/empty/Build + create mode 100644 tools/build/tests/ex/ex.c + create mode 100755 tools/build/tests/run.sh + create mode 100644 tools/lib/api/Build + create mode 100644 tools/lib/api/fd/Build + create mode 100644 tools/lib/api/fs/Build + create mode 100644 tools/lib/api/fs/findfs.c + create mode 100644 tools/lib/api/fs/findfs.h + create mode 100644 tools/lib/api/fs/tracefs.c + create mode 100644 tools/lib/api/fs/tracefs.h + create mode 100644 tools/lib/lockdep/Build + create mode 100644 tools/lib/traceevent/Build + create mode 100644 tools/perf/Build + create mode 100644 tools/perf/Documentation/Build.txt + create mode 100644 tools/perf/arch/Build + create mode 100644 tools/perf/arch/arm/Build + create mode 100644 tools/perf/arch/arm/tests/Build + create mode 100644 tools/perf/arch/arm/util/Build + create mode 100644 tools/perf/arch/arm64/Build + create mode 100644 tools/perf/arch/arm64/util/Build + create mode 100644 tools/perf/arch/powerpc/Build + create mode 100644 tools/perf/arch/powerpc/util/Build + create mode 100644 tools/perf/arch/s390/Build + create mode 100644 tools/perf/arch/s390/util/Build + create mode 100644 tools/perf/arch/sh/Build + create mode 100644 tools/perf/arch/sh/util/Build + create mode 100644 tools/perf/arch/sparc/Build + create mode 100644 tools/perf/arch/sparc/util/Build + create mode 100644 tools/perf/arch/x86/Build + create mode 100644 tools/perf/arch/x86/tests/Build + create mode 100644 tools/perf/arch/x86/util/Build + create mode 100644 tools/perf/bench/Build + create mode 100644 tools/perf/scripts/Build + create mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/Build + create mode 100644 tools/perf/scripts/python/Perf-Trace-Util/Build + create mode 100644 tools/perf/tests/Build + create mode 100644 tools/perf/ui/Build + create mode 100644 tools/perf/ui/browsers/Build + create mode 100644 tools/perf/ui/gtk/Build + create mode 100644 tools/perf/ui/tui/Build + create mode 100644 tools/perf/util/Build + create mode 100644 tools/perf/util/scripting-engines/Build +Merging clockevents/clockevents/next (4c8305221193 clocksource: Driver for Conexant Digicolor SoC timer) +$ git merge clockevents/clockevents/next +Resolved 'arch/arm/mach-rockchip/Kconfig' using previous resolution. +Resolved 'drivers/clocksource/Kconfig' using previous resolution. +Resolved 'drivers/clocksource/rockchip_timer.c' using previous resolution. +Auto-merging drivers/clocksource/rockchip_timer.c +CONFLICT (add/add): Merge conflict in drivers/clocksource/rockchip_timer.c +Auto-merging drivers/clocksource/Kconfig +CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig +Auto-merging arch/arm/mach-rockchip/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-rockchip/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 176a52b2f0a8] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (30263b4052c6 EDAC, mv64x60_edac: Fix an error code in probe()) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (91d117921216 irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type) +$ git merge irqchip/irqchip/for-next +Already up-to-date. +Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge tiny/tiny/next +Already up-to-date. +Merging ftrace/for-next (c19565fc83e6 Merge branch 'for-next/ftrace/core' into trace/for-next) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace.c +Auto-merging fs/Makefile +Merge made by the 'recursive' strategy. + fs/Makefile | 1 + + fs/tracefs/Makefile | 4 + + fs/tracefs/inode.c | 644 +++++++++++++++++++++++++++++++++++ + include/linux/tracefs.h | 45 +++ + include/uapi/linux/magic.h | 2 + + kernel/trace/ftrace.c | 22 +- + kernel/trace/trace.c | 187 +++++----- + kernel/trace/trace.h | 2 +- + kernel/trace/trace_events.c | 32 +- + kernel/trace/trace_functions_graph.c | 7 +- + kernel/trace/trace_kprobe.c | 10 +- + kernel/trace/trace_probe.h | 2 +- + kernel/trace/trace_stat.c | 10 +- + 13 files changed, 826 insertions(+), 142 deletions(-) + create mode 100644 fs/tracefs/Makefile + create mode 100644 fs/tracefs/inode.c + create mode 100644 include/linux/tracefs.h +Merging rcu/rcu/next (b52e22f3021d Merge with c8bcfbf1b744 (rcu: Process offlining and onlining only at grace-period start)) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/idle.c +Auto-merging kernel/rcu/tree_plugin.h +Auto-merging init/Kconfig +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/atomic_ops.txt | 45 +-- + Documentation/kernel-parameters.txt | 20 +- + Documentation/kernel-per-CPU-kthreads.txt | 34 +- + Documentation/memory-barriers.txt | 42 ++- + Documentation/timers/NO_HZ.txt | 10 +- + arch/x86/kernel/smpboot.c | 10 +- + include/linux/cpu.h | 4 + + include/linux/lockdep.h | 7 +- + include/linux/rcupdate.h | 40 ++- + include/linux/srcu.h | 2 +- + init/Kconfig | 13 + + kernel/cpu.c | 4 +- + kernel/rcu/rcutorture.c | 27 +- + kernel/rcu/srcu.c | 19 +- + kernel/rcu/tiny.c | 14 +- + kernel/rcu/tree.c | 363 ++++++++++++++------- + kernel/rcu/tree.h | 12 +- + kernel/rcu/tree_plugin.h | 233 ++++++------- + kernel/rcu/tree_trace.c | 4 +- + kernel/rcu/update.c | 72 +++- + kernel/sched/idle.c | 9 +- + lib/Kconfig.debug | 35 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../selftests/rcutorture/configs/rcu/CFcommon | 1 + + 24 files changed, 651 insertions(+), 371 deletions(-) +Merging kvm/linux-next (4ff6f8e61eb7 KVM: emulate: fix CMPXCHG8B on 32-bit hosts) +$ git merge kvm/linux-next +Merge made by the 'recursive' strategy. + arch/arm/include/asm/kvm_mmu.h | 2 +- + arch/arm/kvm/arm.c | 2 +- + arch/arm/kvm/trace.h | 10 +++++++--- + arch/x86/kvm/emulate.c | 3 ++- + arch/x86/kvm/vmx.c | 23 ++++++++++++++--------- + 5 files changed, 25 insertions(+), 15 deletions(-) +Merging kvm-arm/next (4b990589952f KVM: Remove unused config symbol) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (de8e5d744051 KVM: Disable compat ioctl for s390) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (a2e75bc2ee20 xenbus: Add proper handling of XS_ERROR from Xenbus for transactions.) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying()) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (b5b3ab523e31 Merge branch 'for-3.19-fixes' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (c57c0fa4bc9c toshiba_acpi: Cleanup GPL header) +$ 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 regmap/for-next (48bbdbb173fa Merge remote-tracking branch 'regmap/fix/irq' into regmap-linus) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-irq.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging hsi/for-next (f034125dfdae HSI: nokia-modem: fix error return code) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/clients/nokia-modem.c | 1 + + 1 file changed, 1 insertion(+) +Merging leds/for-next (ffe2428614d2 leds: flash: remove stray include directive) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/leds-pwm.c | 3 --- + include/linux/led-class-flash.h | 1 - + 2 files changed, 4 deletions(-) +Merging ipmi/for-next (3a31f945b709 ipmi: Remove incorrect use of seq_has_overflowed) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 4 ++-- + drivers/char/ipmi/ipmi_si_intf.c | 4 ++-- + drivers/char/ipmi/ipmi_ssif.c | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) +Merging driver-core/driver-core-next (c517d838eb7d Linux 4.0-rc1) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (c517d838eb7d Linux 4.0-rc1) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (c517d838eb7d Linux 4.0-rc1) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (c517d838eb7d Linux 4.0-rc1) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (3e264ffc831e USB: mos7840: remove unused code) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging staging/staging-next (c517d838eb7d Linux 4.0-rc1) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (c517d838eb7d Linux 4.0-rc1) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging cgroup/for-next (8abba61bcfd4 Merge branch 'for-3.19-fixes' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (cad8000836ef Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging target-updates/for-next (aa04dae454d0 target: Set LBPWS10 bit in Logical Block Provisioning EVPD) +$ 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 pinctrl/for-next (c517d838eb7d Linux 4.0-rc1) +$ git merge pinctrl/for-next +Already up-to-date. +Merging vhost/linux-next (4fe00489e61c vhost: drop hard-coded num_buffers size) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/vhost/net.c | 25 ++++++++++++++----------- + 1 file changed, 14 insertions(+), 11 deletions(-) +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 (2f97c20e5f7c gpio: tps65912: fix wrong container_of arguments) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-tps65912.c | 14 ++++++++++---- + drivers/gpio/gpiolib-of.c | 9 +++++---- + 2 files changed, 15 insertions(+), 8 deletions(-) +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 (b65af27ad89d pwm: tegra: Use NSEC_PER_SEC) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (817bd7253291 dma-buf: cleanup dma_buf_export() to make it easily extensible) +$ git merge dma-buf/for-next +Auto-merging drivers/staging/android/ion/ion.c +Auto-merging drivers/media/v4l2-core/videobuf2-vmalloc.c +Auto-merging drivers/gpu/drm/tegra/gem.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_dmabuf.c +Merge made by the 'recursive' strategy. + Documentation/dma-buf-sharing.txt | 23 +++++++------ + drivers/dma-buf/dma-buf.c | 47 ++++++++++++-------------- + drivers/dma-buf/fence.c | 3 ++ + drivers/dma-buf/reservation.c | 5 +-- + drivers/gpu/drm/armada/armada_gem.c | 10 ++++-- + drivers/gpu/drm/drm_prime.c | 12 ++++--- + drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 9 +++-- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 10 ++++-- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 9 ++++- + drivers/gpu/drm/tegra/gem.c | 10 ++++-- + drivers/gpu/drm/ttm/ttm_object.c | 9 +++-- + drivers/gpu/drm/udl/udl_dmabuf.c | 9 ++++- + drivers/media/v4l2-core/videobuf2-dma-contig.c | 8 ++++- + drivers/media/v4l2-core/videobuf2-dma-sg.c | 8 ++++- + drivers/media/v4l2-core/videobuf2-vmalloc.c | 8 ++++- + drivers/staging/android/ion/ion.c | 9 +++-- + include/linux/dma-buf.h | 34 +++++++++++++++---- + 17 files changed, 158 insertions(+), 65 deletions(-) +Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (ec02ace8ca0a clk: Only recalculate the rate if needed) +$ 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 aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0) +$ git merge aio/master +Already up-to-date. +Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. +Merging kselftest/next (6ddf898c23d6 selftests/exec: Check if the syscall exists and bail if not) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/vm/Makefile +Auto-merging tools/testing/selftests/exec/execveat.c +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 14 +++++- + tools/testing/selftests/Makefile | 54 +++++++++++++++++++++- + tools/testing/selftests/breakpoints/Makefile | 19 +++++++- + tools/testing/selftests/cpu-hotplug/Makefile | 14 +++++- + .../{on-off-test.sh => cpu-on-off-test.sh} | 0 + tools/testing/selftests/efivarfs/Makefile | 16 ++++++- + tools/testing/selftests/exec/execveat.c | 10 +++- + tools/testing/selftests/firmware/Makefile | 43 ++++++++++------- + tools/testing/selftests/ftrace/Makefile | 13 +++++- + tools/testing/selftests/ipc/Makefile | 19 +++++++- + tools/testing/selftests/kcmp/Makefile | 13 +++++- + tools/testing/selftests/memfd/Makefile | 17 +++++-- + tools/testing/selftests/memory-hotplug/Makefile | 14 +++++- + .../{on-off-test.sh => mem-on-off-test.sh} | 0 + tools/testing/selftests/mount/Makefile | 12 ++++- + tools/testing/selftests/mqueue/Makefile | 18 ++++++-- + tools/testing/selftests/net/Makefile | 20 ++++++-- + tools/testing/selftests/ptrace/Makefile | 16 +++++-- + tools/testing/selftests/size/Makefile | 12 ++++- + tools/testing/selftests/sysctl/Makefile | 17 ++++++- + tools/testing/selftests/timers/Makefile | 12 ++++- + tools/testing/selftests/user/Makefile | 12 ++++- + tools/testing/selftests/vm/Makefile | 11 ++++- + 23 files changed, 326 insertions(+), 50 deletions(-) + rename tools/testing/selftests/cpu-hotplug/{on-off-test.sh => cpu-on-off-test.sh} (100%) + rename tools/testing/selftests/memory-hotplug/{on-off-test.sh => mem-on-off-test.sh} (100%) +Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump) +$ git merge y2038/y2038 +Auto-merging kernel/cpuset.c +Auto-merging fs/coredump.c +Auto-merging drivers/staging/media/lirc/lirc_serial.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +Merge made by the 'recursive' strategy. + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 4 +- + drivers/staging/ft1000/ft1000.h | 4 +- + drivers/staging/gdm72xx/gdm_sdio.c | 13 +++--- + drivers/staging/gdm72xx/gdm_sdio.h | 4 +- + drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++---------- + drivers/staging/media/lirc/lirc_sasem.c | 20 +++++----- + drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++---------------- + fs/coredump.c | 8 ++-- + kernel/cpuset.c | 12 ++++-- + 11 files changed, 68 insertions(+), 90 deletions(-) +Merging luto-misc/next (2de841c94229 x86: entry_64.S: use more understandable constants) +$ git merge luto-misc/next +Auto-merging arch/x86/kernel/entry_64.S +Auto-merging arch/x86/kernel/entry_32.S +Merge made by the 'recursive' strategy. + arch/x86/ia32/ia32entry.S | 342 ++++++++++++---------- + arch/x86/include/asm/calling.h | 264 ++++++++--------- + arch/x86/include/asm/dwarf2.h | 24 ++ + arch/x86/include/asm/irqflags.h | 4 +- + arch/x86/include/asm/ptrace.h | 13 +- + arch/x86/include/uapi/asm/ptrace-abi.h | 16 +- + arch/x86/include/uapi/asm/ptrace.h | 13 +- + arch/x86/kernel/entry_32.S | 21 +- + arch/x86/kernel/entry_64.S | 504 ++++++++++++++++----------------- + arch/x86/lib/atomic64_cx8_32.S | 50 ++-- + arch/x86/lib/checksum_32.S | 60 ++-- + arch/x86/lib/msr-reg.S | 24 +- + arch/x86/lib/rwsem.S | 44 ++- + arch/x86/lib/thunk_32.S | 18 +- + arch/x86/lib/thunk_64.S | 28 +- + 15 files changed, 716 insertions(+), 709 deletions(-) +Merging access_once/linux-next (c5b19946eb76 kernel: Fix sparse warning for ACCESS_ONCE) +$ git merge access_once/linux-next +Already up-to-date. +Merging livepatching/for-next (0937e3b025f7 livepatch: simplify disable error path) +$ git merge livepatching/for-next +Auto-merging kernel/livepatch/core.c +Merge made by the 'recursive' strategy. + arch/x86/include/asm/livepatch.h | 4 +-- + include/linux/livepatch.h | 8 ++--- + kernel/livepatch/core.c | 67 ++++++++++------------------------------ + 3 files changed, 23 insertions(+), 56 deletions(-) +Merging akpm-current/current (d07b956c650a scripts/gdb: Add infrastructure) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'fs/xfs/xfs_file.c' +Resolved 'Documentation/kasan.txt' using previous resolution. +Resolved 'arch/mips/include/asm/pgtable-bits.h' using previous resolution. +Resolved 'arch/powerpc/kernel/time.c' using previous resolution. +Resolved 'arch/x86/Kconfig' using previous resolution. +Resolved 'arch/x86/include/asm/pgtable.h' using previous resolution. +Resolved 'drivers/block/zram/zram_drv.c' using previous resolution. +Resolved 'drivers/rtc/Makefile' using previous resolution. +Resolved 'fs/notify/fanotify/fanotify.c' using previous resolution. +Resolved 'include/linux/mm.h' using previous resolution. +Resolved 'init/Kconfig' using previous resolution. +Resolved 'kernel/fork.c' using previous resolution. +Resolved 'lib/Makefile' using previous resolution. +Resolved 'mm/slab_common.c' using previous resolution. +Resolved 'mm/slub.c' using previous resolution. +Resolved 'mm/swap.c' using previous resolution. +Resolved 'mm/vmscan.c' using previous resolution. +Resolved 'scripts/Makefile.kasan' using previous resolution. +Resolved 'scripts/module-common.lds' using previous resolution. +Auto-merging scripts/module-common.lds +CONFLICT (content): Merge conflict in scripts/module-common.lds +Auto-merging scripts/Makefile.kasan +CONFLICT (add/add): Merge conflict in scripts/Makefile.kasan +Auto-merging mm/vmstat.c +Auto-merging mm/vmscan.c +CONFLICT (content): Merge conflict in mm/vmscan.c +Auto-merging mm/util.c +Auto-merging mm/swap.c +CONFLICT (content): Merge conflict in mm/swap.c +Auto-merging mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Auto-merging mm/slab_common.c +CONFLICT (content): Merge conflict in mm/slab_common.c +Auto-merging mm/rmap.c +Auto-merging mm/memory.c +Auto-merging mm/madvise.c +Auto-merging mm/huge_memory.c +CONFLICT (modify/delete): mm/filemap_xip.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of mm/filemap_xip.c left in tree. +Auto-merging lib/vsprintf.c +Auto-merging lib/Makefile +CONFLICT (content): Merge conflict in lib/Makefile +Auto-merging lib/Kconfig +Auto-merging kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merging init/Kconfig +CONFLICT (content): Merge conflict in init/Kconfig +Auto-merging include/linux/string.h +Auto-merging include/linux/rtc.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/mm.h +CONFLICT (content): Merge conflict in include/linux/mm.h +Auto-merging include/linux/kexec.h +Auto-merging include/linux/huge_mm.h +Auto-merging fs/xfs/xfs_file.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_file.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/notify/fanotify/fanotify.c +CONFLICT (content): Merge conflict in fs/notify/fanotify/fanotify.c +Auto-merging fs/fat/inode.c +Auto-merging drivers/rtc/interface.c +Auto-merging drivers/rtc/Makefile +CONFLICT (content): Merge conflict in drivers/rtc/Makefile +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/input/input.c +Auto-merging drivers/block/zram/zram_drv.c +CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.c +Auto-merging arch/x86/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging arch/sparc/include/asm/pgtable_64.h +Auto-merging arch/powerpc/kernel/time.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/time.c +Auto-merging arch/powerpc/include/asm/pgtable-ppc64.h +Auto-merging arch/mips/include/asm/pgtable-bits.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/pgtable-bits.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm/include/asm/pgtable-3level.h +Auto-merging Documentation/kasan.txt +CONFLICT (add/add): Merge conflict in Documentation/kasan.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f mm/filemap_xip.c +mm/filemap_xip.c: needs merge +rm 'mm/filemap_xip.c' +$ git commit -v -a +Recorded resolution for 'fs/xfs/xfs_file.c'. +[master 7f8c08efad5f] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/vfat.txt | 10 + + Documentation/leds/leds-class.txt | 3 - + Documentation/printk-formats.txt | 6 + + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 1 + + arch/arm64/include/asm/pgtable.h | 2 + + arch/mips/include/uapi/asm/mman.h | 1 + + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/powerpc/include/asm/pgtable-ppc64.h | 2 + + arch/sparc/include/asm/pgtable_64.h | 9 + + arch/x86/include/asm/pgtable.h | 5 + + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/xtensa/include/uapi/asm/mman.h | 1 + + 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/rtc/class.c | 24 +++ + drivers/rtc/interface.c | 13 +- + drivers/tty/Kconfig | 4 + + drivers/tty/vt/keyboard.c | 110 +++++++--- + fs/ext4/fsync.c | 5 +- + fs/fat/cache.c | 79 ++++--- + fs/fat/dir.c | 2 +- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 61 ++++++ + fs/fat/inode.c | 75 ++++++- + fs/mpage.c | 23 ++- + fs/ocfs2/aops.c | 21 +- + fs/ocfs2/dlm/dlmmaster.c | 10 - + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/proc/task_mmu.c | 4 +- + include/linux/crc64_ecma.h | 56 +++++ + include/linux/huge_mm.h | 4 + + include/linux/input.h | 28 +++ + include/linux/kexec.h | 2 + + include/linux/rmap.h | 9 +- + include/linux/rtc.h | 4 + + include/linux/string.h | 1 + + include/linux/vm_event_item.h | 1 + + include/uapi/asm-generic/mman-common.h | 1 + + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++++++++++++++++++++++++++++ + lib/vsprintf.c | 20 +- + mm/huge_memory.c | 35 ++++ + mm/madvise.c | 150 ++++++++++++++ + mm/memory.c | 1 + + mm/memory_hotplug.c | 11 +- + mm/page_isolation.c | 7 +- + mm/rmap.c | 46 ++++- + mm/slub.c | 2 + + mm/util.c | 30 +++ + mm/vmscan.c | 115 ++++++++--- + mm/vmstat.c | 1 + + 57 files changed, 1514 insertions(+), 147 deletions(-) + create mode 100644 drivers/input/leds.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c +$ git am -3 ../patches/0001-fix-bad-merge-in-akpm-current.patch +Applying: fix bad merge in akpm-current +$ git reset HEAD^ +Unstaged changes after reset: +M mm/slub.c +$ git add -A . +$ git commit -v -a --amend +[master 0b5ce8c07c37] Merge branch 'akpm-current/current' + Date: Wed Feb 25 14:04:42 2015 +1100 +$ git am -3 ../patches/0001-fix-another-bad-merge-in-akpm-current.patch +Applying: fix another bad merge in akpm-current +$ git reset HEAD^ +Unstaged changes after reset: +M mm/memory.c +$ git add -A . +$ git commit -v -a --amend +[master 9d3074bb8154] Merge branch 'akpm-current/current' + Date: Wed Feb 25 14:04:42 2015 +1100 +$ 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: ocfs2: use 64bit variables to track heartbeat time +Applying: lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text +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 + + 2e34ea6cab7b...615f9737253a akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (615f9737253a mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 +++++ + drivers/w1/w1_int.c | 3 +- + fs/ocfs2/cluster/heartbeat.c | 49 ++++++------------------------- + lib/Kconfig | 5 ++-- + mm/backing-dev.c | 35 ++++++++++++++++++++++ + 5 files changed, 55 insertions(+), 45 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..5c79a75dfd20 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing jdelvare-hwmon based on 3.19-rc6 +Unchanged quilt series jdelvare-hwmon diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..6a0b88b5f3df --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20150225 |