Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754376AbbDMXI5 (ORCPT ); Mon, 13 Apr 2015 19:08:57 -0400 Received: from cantor2.suse.de ([195.135.220.15]:47618 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751318AbbDMXIy (ORCPT ); Mon, 13 Apr 2015 19:08:54 -0400 Date: Tue, 14 Apr 2015 01:08:53 +0200 (CEST) From: Jiri Kosina To: Linus Torvalds cc: linux-kernel@vger.kernel.org, live-patching@vger.kernel.org Subject: [GIT PULL] livepatching for 4.1 Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1531 Lines: 50 Linus, please pull from git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git for-linus to receive livepatching update for 4.1 ===== These are mostly smaller things that got accumulated during the development cycle. The unified solution is still being worked on and is not mature enough for 4.1 yet. - s390 livepatching support, from Jiri Slaby (has Ack from s390 maintainers) - error handling simplification, from Josh Poimboeuf - two minor code cleanups from Josh Poimboeuf and Miroslav Benes ===== Thanks. ---------------------------------------------------------------- Jiri Slaby (1): livepatch: add support on s390 Josh Poimboeuf (2): livepatch: simplify disable error path livepatch: remove unnecessary call to klp_find_object_module() Miroslav Benes (1): livepatch: remove extern specifier from header files arch/s390/Kconfig | 3 ++ arch/s390/include/asm/livepatch.h | 43 ++++++++++++++++++++++++ arch/x86/include/asm/livepatch.h | 4 +-- include/linux/livepatch.h | 8 ++--- kernel/livepatch/core.c | 69 ++++++++++----------------------------- 5 files changed, 69 insertions(+), 58 deletions(-) create mode 100644 arch/s390/include/asm/livepatch.h -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/