#
ba00410b |
| 09-Dec-2014 |
Al Viro <viro@zeniv.linux.org.uk> |
Merge branch 'iov_iter' into for-next
|
#
dd63af10 |
| 06-Dec-2014 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 3.18-rc7 into tty-next
This resolves the merge issue with drivers/tty/serial/of_serial.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
deef2a11 |
| 03-Dec-2014 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 3.18-rc7 into staging-work.
We want those staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
76771c93 |
| 02-Dec-2014 |
Joerg Roedel <jroedel@suse.de> |
Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next
Conflicts: drivers/iommu/arm-smmu.c
|
#
e8115e79 |
| 02-Dec-2014 |
Dave Airlie <airlied@redhat.com> |
Merge tag 'v3.18-rc7' into drm-next
This fixes a bunch of conflicts prior to merging i915 tree.
Linux 3.18-rc7
Conflicts: drivers/gpu/drm/exynos/exynos_drm_drv.c drivers/gpu/drm/i915/i915_drv.c
Merge tag 'v3.18-rc7' into drm-next
This fixes a bunch of conflicts prior to merging i915 tree.
Linux 3.18-rc7
Conflicts: drivers/gpu/drm/exynos/exynos_drm_drv.c drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_pm.c drivers/gpu/drm/tegra/dc.c
show more ...
|
#
c00552eb |
| 01-Dec-2014 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 3.18-rc7 into usb-next
We need the xhci fixes here and this resolves a merge issue with drivers/usb/dwc3/ep0.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
Revision tags: v3.18-rc7 |
|
#
acf403ec |
| 27-Nov-2014 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/usb-resume' into for-next
Merge the proper mixer resume support for quirk codes.
|
#
66e6a5a1 |
| 24-Nov-2014 |
Grant Likely <grant.likely@linaro.org> |
Merge tag 'v3.18-rc6' into devicetree/next
v3.18-rc6 contains an important DT bug fix, c1a2086e2d, "of/selftest: Fix off-by-one error in removal path" which affects testing of the overlay patch seri
Merge tag 'v3.18-rc6' into devicetree/next
v3.18-rc6 contains an important DT bug fix, c1a2086e2d, "of/selftest: Fix off-by-one error in removal path" which affects testing of the overlay patch series. Merge it into the devicetree/next staging branch so that the overlay patches are applied on top of a known working tree.
Linux 3.18-rc6
Conflicts: drivers/of/address.c
show more ...
|
Revision tags: v3.18-rc6 |
|
#
cceb9bd6 |
| 22-Nov-2014 |
Tejun Heo <tj@kernel.org> |
Merge branch 'master' into for-3.19
Pull in to receive 54ef6df3f3f1 ("rcu: Provide counterpart to rcu_dereference() for non-RCU situations").
Signed-off-by: Tejun Heo <tj@kernel.org>
|
#
3035b675 |
| 21-Nov-2014 |
Al Viro <viro@zeniv.linux.org.uk> |
Merge branch 'overlayfs-current' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into for-linus
"The biggest change is to rename the filesystem from "overlayfs" to "overlay". This will
Merge branch 'overlayfs-current' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into for-linus
"The biggest change is to rename the filesystem from "overlayfs" to "overlay". This will allow legacy overlayfs to be easily carried by distros alongside the new mainline one. Also fix a couple of copy-up races and allow escaping comma character in filenames."
The last bit is about commas in pathname mount options...
show more ...
|
#
a69862d8 |
| 20-Nov-2014 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'for-linus' into test/usb-resume
|
#
a0200108 |
| 20-Nov-2014 |
Jiri Kosina <jkosina@suse.cz> |
Merge Linus' tree to be be to apply submitted patches to newer code than current trivial.git base
|
#
54499b2a |
| 19-Nov-2014 |
Daniel Vetter <daniel.vetter@ffwll.ch> |
Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued
So with all the code movement and extraction in intel_pm.c in -next git is hopelessly confused with
commit 2208d655a91f9879bd9a39ff
Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued
So with all the code movement and extraction in intel_pm.c in -next git is hopelessly confused with
commit 2208d655a91f9879bd9a39ff9df05dd668b3512c Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Fri Nov 14 09:25:29 2014 +0100
drm/i915: drop WaSetupGtModeTdRowDispatch:snb
from -fixes. Worse even small changes in -next move around the conflict context so rerere is equally useless. Let's just backmerge and be done with it.
Conflicts: drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_pm.c
Except for git getting lost no tricky conflicts really.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
show more ...
|
#
56429e9b |
| 19-Nov-2014 |
J. Bruce Fields <bfields@redhat.com> |
merge nfs bugfixes into nfsd for-3.19 branch
In addition to nfsd bugfixes, there are some fixes in -rc5 for client bugs that can interfere with my testing.
|
#
b10778a0 |
| 19-Nov-2014 |
James Morris <james.l.morris@oracle.com> |
Merge commit 'v3.17' into next
|
#
b3521729 |
| 19-Nov-2014 |
Jens Axboe <axboe@fb.com> |
Merge branch 'master' into for-3.19/drivers
|
#
39ae97ea |
| 17-Nov-2014 |
Takashi Iwai <tiwai@suse.de> |
Merge tag 'asoc-v3.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.18
As well as the usual driver fixes there's a few other things here:
On
Merge tag 'asoc-v3.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.18
As well as the usual driver fixes there's a few other things here:
One is a fix for a race in DPCM which is unfortuantely a rather large diffstat, this is the result of growing usage of the mainline code and hence more detailed testing so I'm relatively happy.
The other is a fix for non-DT machine driver matching following some of the componentization work which is much more focused.
Both have had a while to cook in -next.
show more ...
|
Revision tags: v3.18-rc5 |
|
#
076ce448 |
| 14-Nov-2014 |
David S. Miller <davem@davemloft.net> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ethernet/chelsio/cxgb4vf/sge.c drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
sge.c was overlapping two changes,
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ethernet/chelsio/cxgb4vf/sge.c drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
sge.c was overlapping two changes, one to use the new __dev_alloc_page() in net-next, and one to use s->fl_pg_order in net.
ixgbe_phy.c was a set of overlapping whitespace changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
#
b3cf93b3 |
| 12-Nov-2014 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie: "Radeon and i915 fixes.
I probably should have sent these earlier, but nothing too urgent
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie: "Radeon and i915 fixes.
I probably should have sent these earlier, but nothing too urgent in them:
- i915: blackscreen and corruption fixes - radeon: oops, locking and stability"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/radeon: add missing crtc unlock when setting up the MC drm/radeon: use gart for DMA IB tests drm/radeon: make sure mode init is complete in bandwidth_update drm/radeon: set correct CE ram size for CIK drm/i915: safeguard against too high minimum brightness drm/i915: vlv: fix gunit HW state corruption during S4 suspend drm/i915: Disable caches for Global GTT.
show more ...
|
#
890ca861 |
| 12-Nov-2014 |
Ingo Molnar <mingo@kernel.org> |
Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
Revision tags: v3.18-rc4 |
|
#
2730fa0d |
| 07-Nov-2014 |
Dave Airlie <airlied@redhat.com> |
Merge branch 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
- fix missing crtc unlock in MC setup - set optimal CE ram config - use gart rather than vram for DMA IB tes
Merge branch 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
- fix missing crtc unlock in MC setup - set optimal CE ram config - use gart rather than vram for DMA IB tests to avoid coherency issues with HDP - fix a crasher with laptop mode and TDP scripts
* 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux: drm/radeon: add missing crtc unlock when setting up the MC drm/radeon: use gart for DMA IB tests drm/radeon: make sure mode init is complete in bandwidth_update drm/radeon: set correct CE ram size for CIK
show more ...
|
#
8efe82ca |
| 03-Nov-2014 |
Alex Deucher <alexander.deucher@amd.com> |
drm/radeon: make sure mode init is complete in bandwidth_update
The power management code calls into the display code for certain things. If certain power management sysfs attributes are called bef
drm/radeon: make sure mode init is complete in bandwidth_update
The power management code calls into the display code for certain things. If certain power management sysfs attributes are called before the driver has finished initializing all of the hardware we can run into problems with uninitialized modesetting state. Add a check to make sure modesetting init has completed to the bandwidth update callbacks to fix this. Can be triggered by the tlp and laptop start up scripts depending on the timing.
bugs: https://bugzilla.kernel.org/show_bug.cgi?id=83611 https://bugs.freedesktop.org/show_bug.cgi?id=85771
Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
show more ...
|
Revision tags: v3.18-rc3, v3.18-rc2, v3.18-rc1 |
|
#
ee5db7e4 |
| 06-Oct-2014 |
Jiri Kosina <jkosina@suse.cz> |
Merge branches 'for-3.18/always-poll-quirk', 'for-3.18/logitech', 'for-3.18/picolcd', 'for-3.18/rmi', 'for-3.18/sony', 'for-3.18/uhid', 'for-3.18/upstream' and 'for-3.18/wacom' into for-linus
|
Revision tags: v3.17 |
|
#
447a8b85 |
| 03-Oct-2014 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.18.
|
Revision tags: v3.17-rc7, v3.17-rc6, v3.17-rc5 |
|
#
db985cbd |
| 14-Sep-2014 |
Thomas Gleixner <tglx@linutronix.de> |
Merge tag 'irqchip-core-3.18' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core changes for v3.18
- renesas: suspend to RAM, runtime PM, cleanups and DT binding docs - key
Merge tag 'irqchip-core-3.18' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core changes for v3.18
- renesas: suspend to RAM, runtime PM, cleanups and DT binding docs - keystone: add new driver - hip04: add Hisilicon HiP04 driver (without touching irq-gic.c) - gic: Use defines instead of magic number, preserve v2 bybass bits - handle_domain_irq: common low level interrupt entry handler
show more ...
|