nicklovell23@slimbuild:~/slim/kernel/samsung/d2$ git merge 674f830709b75bb1b90a2e0200e7ec110fb574ac
Merge made by the 'recursive' strategy.
 drivers/gpu/msm/adreno.c         |   56 ++++++++++++++++++++++++++++++++++----------------------
 drivers/gpu/msm/kgsl_pwrctrl.c   |    7 ++++++-
 drivers/gpu/msm/kgsl_pwrctrl.h   |    2 ++
 drivers/hwmon/pm8xxx-adc-scale.c |   28 ++++++++++++++--------------
 drivers/iommu/msm_iommu.c        |    4 ++--
 sound/soc/codecs/wcd9304.c       |    9 +++++----
 sound/usb/mixer.c                |    6 ++++--
 7 files changed, 67 insertions(+), 45 deletions(-)
nicklovell23@slimbuild:~/slim/kernel/samsung/d2$ git merge b87061d88bb223d21d7f0621e218526011460f03
Auto-merging Makefile
Merge made by the 'recursive' strategy.
 Makefile                                      |    2 +-
 arch/m32r/boot/compressed/Makefile            |    6 +++---
 arch/m32r/boot/compressed/misc.c              |   12 +++++++++++-
 arch/powerpc/Kconfig                          |    1 +
 arch/powerpc/include/asm/page.h               |   10 ++++++++++
 arch/x86/kvm/emulate.c                        |    4 ----
 drivers/acpi/ec.c                             |    4 ++++
 drivers/base/memory.c                         |    2 ++
 drivers/base/regmap/regmap.c                  |    2 +-
 drivers/gpu/drm/i915/i915_reg.h               |    2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c           |   58 +++++++++++++++++++++++++++++++++++++++-------------------
 drivers/net/bonding/bond_main.c               |    8 +++++++-
 drivers/net/ethernet/realtek/8139cp.c         |    1 +
 drivers/net/macvtap.c                         |   62 +++++++++++++++++++++++++++++++++++++-------------------------
 drivers/net/tun.c                             |    6 ++++--
 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c |   10 ++++++++++
 drivers/net/wireless/iwlegacy/4965-mac.c      |    2 +-
 drivers/target/target_core_cdb.c              |    9 ++++++---
 drivers/tty/hvc/hvsi_lib.c                    |    4 ++--
 drivers/vhost/vhost.c                         |    1 +
 fs/bio.c                                      |   20 +++++++++++++++-----
 fs/jfs/jfs_dtree.c                            |   31 +++++++++++++++++++++++--------
 include/linux/icmpv6.h                        |    2 ++
 include/linux/ipv6.h                          |    1 +
 net/bridge/br_multicast.c                     |    3 ++-
 net/core/neighbour.c                          |   10 ++++++----
 net/core/sysctl_net_core.c                    |    7 ++++++-
 net/ipv4/fib_trie.c                           |    5 +----
 net/ipv4/tcp_cubic.c                          |   12 +++++++-----
 net/ipv6/addrconf.c                           |   10 ++++------
 net/ipv6/icmp.c                               |   10 +++++++++-
 net/ipv6/ip6_fib.c                            |   16 ++++++++++++----
 net/ipv6/ndisc.c                              |   16 +++++++++-------
 net/ipv6/reassembly.c                         |    5 +++++
 net/ipv6/tcp_ipv6.c                           |    2 +-
 net/sched/sch_htb.c                           |    2 +-
 net/sunrpc/xdr.c                              |    9 ++++++---
 net/tipc/eth_media.c                          |   15 ++++++++++++++-
 sound/isa/opti9xx/opti92x-ad1848.c            |    8 ++------
 39 files changed, 268 insertions(+), 122 deletions(-)
nicklovell23@slimbuild:~/slim/kernel/samsung/d2$ git push ssh://nicklovell23@review.slimroms.net:29299/SlimRoms/kernel_samsung_d2 HEAD:refs/for/jb4.3
Counting objects: 617, done.
Delta compression using up to 12 threads.
Compressing objects: 100% (105/105), done.
Writing objects: 100% (353/353), 60.40 KiB, done.
Total 353 (delta 287), reused 310 (delta 246)
remote: Resolving deltas: 100% (287/287)
remote: Processing changes: refs: 1, done
remote: (W) 405eb4e: commit subject >65 characters; use shorter first paragraph
remote: (W) 25092d5: commit subject >65 characters; use shorter first paragraph
remote: (W) c4f6d25: commit subject >65 characters; use shorter first paragraph
remote: (W) c4f6d25: commit message lines >70 characters; manually wrap lines
remote: (W) ed6b811: commit subject >65 characters; use shorter first paragraph
remote: (W) 6e99f32: commit subject >65 characters; use shorter first paragraph
remote: (W) 3f661fb: commit subject >65 characters; use shorter first paragraph
remote: (W) d3ba218: commit subject >65 characters; use shorter first paragraph
remote: (W) 3b5c001: commit subject >65 characters; use shorter first paragraph
remote: (W) 7f13220: commit subject >65 characters; use shorter first paragraph
remote: (W) cce0727: commit subject >65 characters; use shorter first paragraph
remote: (W) 98fadc1: commit subject >65 characters; use shorter first paragraph
remote: (W) 8708ea2: commit subject >65 characters; use shorter first paragraph
remote: (W) d60aa7f: commit subject >65 characters; use shorter first paragraph
remote: (W) d60aa7f: commit message lines >70 characters; manually wrap lines
remote: (W) 5e1f777: commit subject >65 characters; use shorter first paragraph
remote: (W) 5e1f777: commit message lines >70 characters; manually wrap lines
To ssh://nicklovell23@review.slimroms.net:29299/SlimRoms/kernel_samsung_d2
 ! [remote rejected] HEAD -> refs/for/jb4.3 (change 33815 closed)
error: failed to push some refs to 'ssh://nicklovell23@review.slimroms.net:29299/SlimRoms/kernel_samsung_d2'