Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1541810 > unrolled thread

[GIT PULL] trivial for 4.10

Started byJiri Kosina <jikos@kernel.org>
First post2016-12-14 11:10 +0100
Last post2016-12-14 15:30 +0100
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [GIT PULL] trivial for 4.10 Jiri Kosina <jikos@kernel.org> - 2016-12-14 11:10 +0100
    Re: [GIT PULL] trivial for 4.10 Joe Perches <joe@perches.com> - 2016-12-14 15:30 +0100

#1541810 — [GIT PULL] trivial for 4.10

FromJiri Kosina <jikos@kernel.org>
Date2016-12-14 11:10 +0100
Subject[GIT PULL] trivial for 4.10
Message-ID<sOeFA-5aj-33@gated-at.bofh.it>
Linus,

please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus

to receive 4.10 merge window updates from trivial tree

I hereby confess to having rebased the for-next branch, because I wanted 
to drop all the '\n' additions that were obsoleted by the recent printk / 
pr_cont changes, and didn't want to pollute the history with unnecessary 
commit+revert for such a triviality; as a consequence, you're getting 
different commit hashes for the 5 commits compared to what's in 
linux-next; I believe it's fine for such a insignificant tree / commits.

Thanks.

----------------------------------------------------------------
Aaron Sierra (1):
      NTB: correct ntb_spad_count comment typo

Colin Ian King (1):
      misc: ibmasm: fix typo in error message

Masanari Iida (1):
      treewide: Fix printk() message errors

Michael Witten (1):
      Documentation/device-mapper: s/getsize/getsz/

Paul Bolle (2):
      Remove last traces of ikconfig.h
      Remove references to dead make variable LINUX_INCLUDE

 Documentation/device-mapper/delay.txt               | 4 ++--
 Documentation/device-mapper/dm-crypt.txt            | 2 +-
 Documentation/device-mapper/linear.txt              | 8 ++++----
 Documentation/device-mapper/striped.txt             | 4 ++--
 Documentation/device-mapper/switch.txt              | 2 +-
 Documentation/dontdiff                              | 1 -
 arch/arm64/kernel/hibernate.c                       | 4 ++--
 arch/mips/kernel/asm-offsets.c                      | 2 +-
 arch/s390/boot/compressed/Makefile                  | 2 +-
 arch/sh/kernel/cpu/Makefile                         | 2 +-
 arch/sh/kernel/cpu/irq/Makefile                     | 2 +-
 arch/x86/boot/compressed/Makefile                   | 2 +-
 drivers/acpi/Kconfig                                | 2 +-
 drivers/firmware/efi/libstub/Makefile               | 2 +-
 drivers/isdn/hisax/q931.c                           | 2 +-
 drivers/media/usb/dvb-usb-v2/af9015.c               | 2 +-
 drivers/mfd/max77620.c                              | 2 +-
 drivers/misc/ibmasm/module.c                        | 2 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c   | 2 +-
 drivers/net/ethernet/qlogic/qed/qed_int.c           | 4 ++--
 drivers/net/ethernet/qlogic/qed/qed_sp_commands.c   | 2 +-
 drivers/net/wireless/ath/ath10k/pci.c               | 2 +-
 drivers/net/wireless/ath/wil6210/txrx.c             | 2 +-
 drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 2 +-
 drivers/scsi/aic7xxx/aicasm/aicasm.c                | 2 +-
 drivers/usb/dwc3/gadget.c                           | 2 +-
 include/linux/ntb.h                                 | 2 +-
 kernel/Makefile                                     | 2 --
 scripts/gcc-plugins/latent_entropy_plugin.c         | 2 +-
 scripts/gcc-plugins/sancov_plugin.c                 | 2 +-
 tools/power/acpi/tools/ec/ec_access.c               | 2 +-
 31 files changed, 36 insertions(+), 39 deletions(-)

-- 
Jiri Kosina
SUSE Labs

[toc] | [next] | [standalone]


#1541939

FromJoe Perches <joe@perches.com>
Date2016-12-14 15:30 +0100
Message-ID<sOiJb-7xh-3@gated-at.bofh.it>
In reply to#1541810
On Wed, 2016-12-14 at 11:05 +0100, Jiri Kosina wrote:
> Linus,
> 
> please pull from
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
> 
> to receive 4.10 merge window updates from trivial tree
> 
> I hereby confess to having rebased the for-next branch, because I wanted 
> to drop all the '\n' additions that were obsoleted by the recent printk / 
> pr_cont changes, and didn't want to pollute the history with unnecessary 
> commit+revert for such a triviality; as a consequence, you're getting 
> different commit hashes for the 5 commits compared to what's in 
> linux-next; I believe it's fine for such a insignificant tree / commits.
> 

I'd rather have the dozen or so single-line newline additions
than the multiple hundreds to thousands of changes that are
still going to be required to get KERN_CONT to work properly
kernel-wide.

Many arch specific printks still have to be fixed for this
new KERN_CONT style.  sparc, powerpc, arm, arm64, and others.

Multiple dozens to hundreds of drivers too.

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web