merge rpi changes with packaging
authorRaspbian kernel package updater <root@raspbian.org>
Sun, 8 Oct 2017 00:59:10 +0000 (00:59 +0000)
committerRaspbian kernel package updater <root@raspbian.org>
Sun, 8 Oct 2017 00:59:10 +0000 (00:59 +0000)
15 files changed:
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
Makefile
arch/arm/boot/dts/Makefile
drivers/pci/pci-sysfs.c
drivers/tty/serial/amba-pl011.c
drivers/video/fbdev/Kconfig
drivers/video/fbdev/Makefile
fs/cifs/cifsfs.c
fs/ext4/super.c
fs/read_write.c
kernel/sysctl.c
kernel/trace/trace.c
scripts/Kbuild.include
scripts/Makefile.dtbinst

Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/ext4/super.c
Simple merge
diff --cc fs/read_write.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge
Simple merge
Simple merge
index 15c503f6792b7c1195025887aa41b1a2f579fa32,ad8dc1c93d04bc929b551c5a47f67d244116c7e7..344ca1c2412cb47623d9cb9e03b39a2018a35349
@@@ -33,9 -34,9 +34,9 @@@ dtbinst-dirs  := $(dts-dirs
  quiet_cmd_dtb_install =       INSTALL $<
        cmd_dtb_install =       mkdir -p $(2); cp $< $(2)
  
 -install-dir = $(patsubst $(dtbinst-root)%,$(INSTALL_DTBS_PATH)%,$(obj))
 +install-dir = $(patsubst $(dtbinst_root)%,$(INSTALL_DTBS_PATH)%,$(obj))
  
- $(dtbinst-files) $(dtbinst-dirs): | __dtbs_install_prep
+ $(dtbinst-files) $(dtboinst-files) $(dtbinst-dirs): | __dtbs_install_prep
  
  $(dtbinst-files): %.dtb: $(obj)/%.dtb
        $(call cmd,dtb_install,$(install-dir))