#
3a485c2b |
| 13-Nov-2017 |
Juergen Gross <jgross@suse.com> |
Merge tag 'v4.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Linux 4.14
|
Revision tags: v4.14 |
|
#
b5cd3b51 |
| 10-Nov-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'linus' into x86/platform, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
4e37fd4d |
| 08-Nov-2017 |
Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
Merge branch 'pm-qos' into pm-cpuidle
|
#
8a103df4 |
| 08-Nov-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
0f1cd81d |
| 08-Nov-2017 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge tag 'v4.14-rc8' into next
Merge with mainline to bring in SPDX markings to avoid annoying merge problems when some header files get deleted.
|
#
141d3b1d |
| 07-Nov-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'linus' into x86/apic, to resolve conflicts
Conflicts: arch/x86/include/asm/x2apic.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
783711f0 |
| 07-Nov-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'linus' into core/objtool, to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
8c5db92a |
| 07-Nov-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'linus' into locking/core, to resolve conflicts
Conflicts: include/linux/compiler-clang.h include/linux/compiler-gcc.h include/linux/compiler-intel.h include/uapi/linux/stddef.h
Si
Merge branch 'linus' into locking/core, to resolve conflicts
Conflicts: include/linux/compiler-clang.h include/linux/compiler-gcc.h include/linux/compiler-intel.h include/uapi/linux/stddef.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
show more ...
|
#
15bcdc94 |
| 07-Nov-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'linus' into perf/core, to fix conflicts
Conflicts: tools/perf/arch/arm/annotate/instructions.c tools/perf/arch/arm64/annotate/instructions.c tools/perf/arch/powerpc/annotate/instruc
Merge branch 'linus' into perf/core, to fix conflicts
Conflicts: tools/perf/arch/arm/annotate/instructions.c tools/perf/arch/arm64/annotate/instructions.c tools/perf/arch/powerpc/annotate/instructions.c tools/perf/arch/s390/annotate/instructions.c tools/perf/arch/x86/tests/intel-cqm.c tools/perf/ui/tui/progress.c tools/perf/util/zlib.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
show more ...
|
Revision tags: v4.14-rc8 |
|
#
7d9a6ef5 |
| 03-Nov-2017 |
Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
Merge branch 'i2c/cht-wc-fusb302-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c/cht-wc-fusb302-immutable immutable branch from Wolfram Sang:
as discussed before, her
Merge branch 'i2c/cht-wc-fusb302-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c/cht-wc-fusb302-immutable immutable branch from Wolfram Sang:
as discussed before, here is the immutable branch for the i2c-cht-wc driver, so you can safely apply Hans' patch [1]
"platform/x86: intel_cht_int33fe: Update fusb302 type string, add properties"
on top of this.
[1] http://patchwork.ozlabs.org/patch/824314/
show more ...
|
#
6297fabd |
| 02-Nov-2017 |
Corey Minyard <cminyard@mvista.com> |
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux into for-next
The IPMI SI driver was split into different pieces, merge the module tree to accountfor that.
S
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux into for-next
The IPMI SI driver was split into different pieces, merge the module tree to accountfor that.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
show more ...
|
#
3357b0d3 |
| 02-Nov-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'x86/mpx/prep' into x86/asm
Pick up some of the MPX commits that modify the syscall entry code, to have a common base and to reduce conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.
Merge branch 'x86/mpx/prep' into x86/asm
Pick up some of the MPX commits that modify the syscall entry code, to have a common base and to reduce conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
show more ...
|
#
7a88cbd8 |
| 02-Nov-2017 |
Dave Airlie <airlied@redhat.com> |
Backmerge tag 'v4.14-rc7' into drm-next
Linux 4.14-rc7
Requested by Ben Skeggs for nouveau to avoid major conflicts, and things were getting a bit conflicty already, esp around amdgpu reverts.
|
#
a53a0ab8 |
| 01-Nov-2017 |
Takashi Iwai <tiwai@suse.de> |
Merge tag 'asoc-fix-v4.14-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.14
A bunch of fixes here, mostly device specific ones (the biggest
Merge tag 'asoc-fix-v4.14-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.14
A bunch of fixes here, mostly device specific ones (the biggest one being the revert of the hotword support for rt5514), with a couple of core fixes for potential issues with corrupted or otherwise invalid topology files.
show more ...
|
#
e1ea2f98 |
| 30-Oct-2017 |
David S. Miller <davem@davemloft.net> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Several conflicts here.
NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to nfp_fl_output() needed some adjustments because the
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Several conflicts here.
NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to nfp_fl_output() needed some adjustments because the code block is in an else block now.
Parallel additions to net/pkt_cls.h and net/sch_generic.h
A bug fix in __tcp_retransmit_skb() conflicted with some of the rbtree changes in net-next.
The tc action RCU callback fixes in 'net' had some overlap with some of the recent tcf_block reworking.
Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
#
e17bae32 |
| 30-Oct-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge tag 'v4.14-rc7' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
Revision tags: v4.14-rc7 |
|
#
90e68720 |
| 28-Oct-2017 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge tag 'arc-4.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
- Fixes for HSDK platform
- module build error for !LLSC config
* tag 'arc
Merge tag 'arc-4.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
- Fixes for HSDK platform
- module build error for !LLSC config
* tag 'arc-4.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: ARC: unbork module link errors with !CONFIG_ARC_HAS_LLSC ARC: [plat-hsdk] Increase SDIO CIU frequency to 50000000Hz ARC: [plat-hsdk] select CONFIG_RESET_HSDK from Kconfig
show more ...
|
#
3990bede |
| 26-Oct-2017 |
Wolfram Sang <wsa@the-dreams.de> |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.15
This cycle has been real quiet for me. There's only the one trivial patch that somewhat simplifies DT parsing i
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.15
This cycle has been real quiet for me. There's only the one trivial patch that somewhat simplifies DT parsing in the i2c-mux-reg driver.
show more ...
|
#
91de76e6 |
| 23-Oct-2017 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge tag 'v4.14-rc6' into next
Merge with mainline to bring in the timer API changes.
|
#
f95b23a1 |
| 23-Oct-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'x86/urgent' into x86/asm, to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
Revision tags: v4.14-rc6 |
|
#
a2ab5fc4 |
| 21-Oct-2017 |
Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
Merge branch 'pm-sleep' into pm-core
|
#
96753522 |
| 20-Oct-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'x86/urgent' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
ca4b9c3b |
| 20-Oct-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
c23fed1d |
| 19-Oct-2017 |
Mark Brown <broonie@kernel.org> |
Merge branch 'linus-4.14-rc4-acp-prereq' of git://people.freedesktop.org/~agd5f/linux into asoc-amd
|
#
396665e8 |
| 18-Oct-2017 |
Stefan Schmidt <stefan@datenfreihafen.org> |
Merge remote-tracking branch 'net-next/master'
|