[linux] 02/05: Merge remote-tracking branch 'alioth/sid'
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Wed Apr 13 19:54:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository linux.
commit 68c5c5997cdb5a3c6493f2351d7663e089b7f421
Merge: 6e05e68 dfd9a83
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Wed Apr 13 20:43:46 2016 +0100
Merge remote-tracking branch 'alioth/sid'
Merge open changelog entry for 4.4.6-2 into our open changelog entry.
Refresh the new patches.
debian/changelog | 9 ++
debian/config/armel/config.marvell | 4 +-
debian/config/armhf/config.armmp | 1 +
...rkwood-add-kirkwood-ds112.dtb-to-Makefile.patch | 28 ++++
...kwood-add-kirkwood-nsa320.dtb-to-Makefile.patch | 26 ++++
...s-orion5x-add-device-tree-for-kurobox-pro.patch | 171 +++++++++++++++++++++
debian/patches/series | 3 +
7 files changed, 240 insertions(+), 2 deletions(-)
diff --cc debian/changelog
index 3c9772e,c69d435..c1a281f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,381 -1,19 +1,390 @@@
-linux (4.4.6-2) UNRELEASED; urgency=medium
+linux (4.5.1-1~exp1) UNRELEASED; urgency=medium
- [ Salvatore Bonaccorso ]
- * [x86] iopl/64: properly context-switch IOPL on Xen PV (CVE-2016-3157)
+ * New upstream stable update:
+ https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.5.1
+ - [x86] entry/compat: Keep TS_COMPAT set during signal delivery
+ - [x86] perf/intel: Add definition for PT PMI bit
+ - [x86] KVM: fix missed hardware breakpoints
+ - [x86] KVM: i8254: change PIT discard tick policy
+ - [x86] KVM: fix spin_lock_init order on x86
+ - [x86] KVM: VMX: avoid guest hang on invalid invept instruction
+ - [x86] KVM: VMX: avoid guest hang on invalid invvpid instruction
+ - [x86] KVM: VMX: fix nested vpid for old KVM guests
+ - perf/core: Fix perf_sched_count derailment
+ - perf tools: Fix checking asprintf return value
+ - Thermal: Ignore invalid trip points
+ - sched/cputime: Fix steal_account_process_tick() to always return jiffies
+ - sched/fair: Avoid using decay_load_missed() with a negative value
+ - [x86] EDAC/sb_edac: Fix computation of channel address
+ - [x86] EDAC, amd64_edac: Shift wrapping issue in f1x_get_norm_dct_addr()
+ - [s390x] fix floating pointer register corruption (again)
+ - [s390x] cpumf: add missing lpp magic initialization
+ - [s390x] pci: enforce fmb page boundary rule
+ - [armhf] pinctrl-bcm2835: Fix cut-and-paste error in "pull" parsing
+ - [x86] irq: Cure live lock in fixup_irqs()
+ - [x86] apic: Fix suspicious RCU usage in
+ smp_trace_call_function_interrupt()
+ - [amd64] iopl: Properly context-switch IOPL on Xen PV (CVE-2016-3157)
+ - [x86] mm: TLB_REMOTE_SEND_IPI should count pages
+ - sg: fix dxferp in from_to case
+ - aacraid: Fix RRQ overload
+ - aacraid: Fix memory leak in aac_fib_map_free
+ - aacraid: Set correct msix count for EEH recovery
+ - sd: Fix discard granularity when LBPRZ=1
+ - ncr5380: Correctly clear command pointers and lists after bus reset
+ - ncr5380: Dont release lock for PIO transfer
+ - ncr5380: Dont re-enter NCR5380_select()
+ - ncr5380: Forget aborted commands
+ - ncr5380: Fix NCR5380_select() EH checks and result handling
+ - ncr5380: Call scsi_eh_prep_cmnd() and scsi_eh_restore_cmnd() as and when
+ appropriate
+ - scsi: storvsc: fix SRB_STATUS_ABORTED handling
+ - be2iscsi: set the boot_kset pointer to NULL in case of failure
+ - aic7xxx: Fix queue depth handling
+ - libnvdimm: Fix security issue with DSM IOCTL.
+ - libnvdimm, pmem: fix kmap_atomic() leak in error path
+ - dm snapshot: disallow the COW and origin devices from being identical
+ - dm: fix excessive dm-mq context switching
+ - dm thin metadata: don't issue prefetches if a transaction abort
+ has failed
+ - dm cache: make sure every metadata function checks fail_io
+ - dm: fix rq_end_stats() NULL pointer in dm_requeue_original_request()
+ - usb: retry reset if a device times out
+ - usb: hub: fix a typo in hub_port_init() leading to wrong logic
+ - USB: cdc-acm: more sanity checking (CVE-2016-3138)
+ - USB: iowarrior: fix oops with malicious USB descriptors (incomplete fix
+ for CVE-2016-2188)
+ - USB: usb_driver_claim_interface: add sanity checking
+ - USB: mct_u232: add sanity checking in probe
+ - USB: digi_acceleport: do sanity checking for the number of ports
+ - USB: cypress_m8: add endpoint sanity check
+ - Input: powermate - fix oops with malicious USB descriptors
+ (CVE-2016-2186)
+ - ALSA: usb-audio: Fix NULL dereference in create_fixed_stream_quirk()
+ (CVE-2016-2184)
+ - ALSA: usb-audio: Add sanity checks for endpoint accesses (CVE-2016-2184)
+ - ALSA: usb-audio: Minor code cleanup in create_fixed_stream_quirk()
+ - ALSA: usb-audio: Fix double-free in error paths after
+ snd_usb_add_audio_stream() call
+ - crypto: ccp - Add hash state import and export support
+ - crypto: ccp - Limit the amount of information exported
+ - crypto: ccp - Don't assume export/import areas are aligned
+ - crypto: ccp - memset request context to zero during import
+ - crypto: keywrap - memzero the correct memory
+ - [armel/marvell,armhf] crypto: marvell/cesa - forward
+ devm_ioremap_resource() error code
+ - [x86] mei: bus: check if the device is enabled before data transfer
+ - tpm: fix the rollback in tpm_chip_register()
+ - tpm_crb: tpm2_shutdown() must be called before tpm_chip_unregister()
+ - tpm_eventlog.c: fix binary_bios_measurements
+ - tpm: fix the cleanup of struct tpm_chip
+ - HID: logitech: fix Dual Action gamepad support
+ - HID: i2c-hid: fix OOB write in i2c_hid_set_or_send_report()
+ - HID: multitouch: force retrieving of Win8 signature blob
+ - HID: fix hid_ignore_special_drivers module parameter
+ - staging: comedi: ni_tiocmd: change mistaken use of start_src for start_arg
+ - staging: comedi: ni_mio_common: fix the ni_write[blw]() functions
+ - tty: Fix GPF in flush_to_ldisc(), part 2
+ - net: irda: Fix use-after-free in irtty_open()
+ - 8250: use callbacks to access UART_DLL/UART_DLM
+ - saa7134: Fix bytesperline not being set correctly for planar formats
+ - adv7511: TX_EDID_PRESENT is still 1 after a disconnect
+ - bttv: Width must be a multiple of 16 when capturing planar formats
+ - coda: fix first encoded frame payload
+ - media: v4l2-compat-ioctl32: fix missing length copy in put_v4l2_buffer32
+ - mtip32xx: Avoid issuing standby immediate cmd during FTL rebuild
+ - mtip32xx: Fix broken service thread handling
+ - mtip32xx: Remove unwanted code from taskfile error handler
+ - mtip32xx: Fix for rmmod crash when drive is in FTL rebuild
+ - mtip32xx: Handle safe removal during IO
+ - mtip32xx: Handle FTL rebuild failure state during device initialization
+ - mtip32xx: Implement timeout handler
+ - mtip32xx: Cleanup queued requests after surprise removal
+ - ALSA: hda - Fix unexpected resume through regmap code path
+ - ALSA: hda - Apply reboot D3 fix for CX20724 codec, too
+ - [x86] ALSA: intel8x0: Add clock quirk entry for AD1981B on IBM
+ ThinkPad X41.
+ - ALSA: hda - Don't handle ELD notify from invalid port
+ - [x86] ALSA: hda - fix the mic mute button and led problem for a Lenovo AIO
+ - ALSA: hda - Fix unconditional GPIO toggle via automute
+ - [x86] ALSA: hda - Limit i915 HDMI binding only for HSW and later
+ - [x86] ALSA: hda - Fix spurious kernel WARNING on Baytrail HDMI
+ - [x86] ALSA: hda - Really restrict i915 notifier to HSW+
+ - ALSA: hda - Fix forgotten HDMI monitor_present update
+ - [x86] ALSA: hda - Workaround for unbalanced i915 power refcount by
+ concurrent probe
+ - ALSA: hda - Fix missing ELD update at unplugging
+ - jbd2: fix FS corruption possibility in jbd2_journal_destroy() on
+ umount path
+ - [arm64] Update PTE_RDONLY in set_pte_at() for PROT_NONE permission
+ - brd: Fix discard request processing
+ - IB/srpt: Simplify srpt_handle_tsk_mgmt()
+ - bcache: cleaned up error handling around register_cache()
+ - bcache: fix race of writeback thread starting before complete
+ initialization
+ - bcache: fix cache_set_flush() NULL pointer dereference on OOM
+ - mm: memcontrol: reclaim when shrinking memory.high below usage
+ - mm: memcontrol: reclaim and OOM kill when shrinking memory.max below usage
+ - watchdog: don't run proc_watchdog_update if new value is same as old
+ - Bluetooth: Fix potential buffer overflow with Add Advertising
+ - cgroup: ignore css_sets associated with dead cgroups during migration
+ - [amrhf] net: mvneta: enable change MAC address when interface is up
+ - brcmfmac: Increase nr of supported flowrings.
+ - of: alloc anywhere from memblock if range not specified
+ - vfs: show_vfsstat: do not ignore errors from show_devname method
+ - splice: handle zero nr_pages in splice_to_pipe()
+ - quota: Fix possible GPF due to uninitialised pointers
+ - xfs: fix two memory leaks in xfs_attr_list.c error paths
+ - raid1: include bio_end_io_list in nr_queued to prevent freeze_array hang
+ - md/raid5: Compare apples to apples (or sectors to sectors)
+ - RAID5: check_reshape() shouldn't call mddev_suspend
+ - RAID5: revert e9e4c377e2f563 to fix a livelock
+ - raid10: include bio_end_io_list in nr_queued to prevent freeze_array hang
+ - md/raid5: preserve STRIPE_PREREAD_ACTIVE in break_stripe_batch_list
+ - md: multipath: don't hardcopy bio in .make_request path
+ - fuse: do not use iocb after it may have been freed
+ - fuse: Add reference counting for fuse_io_priv
+ - fs/coredump: prevent fsuid=0 dumps into user-controlled directories
+ - [armhf] drm/vc4: Return -EFAULT on copy_from_user() failure
+ - [x86] drm/radeon: disable runtime pm on PX laptops without dGPU
+ power control
+ - drm/radeon: Don't drop DP 2.7 Ghz link setup on some cards.
+ - drm/radeon: rework fbdev handling on chips with no connectors
+ - drm/radeon/mst: fix regression in lane/link handling.
+ - [x86] drm/amdgpu: disable runtime pm on PX laptops without dGPU
+ power control
+ - drm/amdgpu: include the right version of gmc header files for iceland
+ - drm/amd/powerplay: add uvd/vce dpm enabling flag to fix the performance
+ issue for CZ
+ - tracing: Have preempt(irqs)off trace preempt disabled functions
+ - tracing: Fix crash from reading trace_pipe with sendfile
+ - tracing: Fix trace_printk() to print when not using bprintk()
+ - bitops: Do not default to __clear_bit() for __clear_bit_unlock()
+ - [x86] ideapad-laptop: Add ideapad Y700 (15) to the no_hw_rfkill DMI list
+ - mmc: block: fix ABI regression of mmc_blk_ioctl
+ - mmc: mmc_spi: Add Card Detect comments and fix CD GPIO case
+ - mmc: sdhci: move initialisation of command error member
+ - mmc: sdhci: clean up command error handling
+ - mmc: sdhci: fix command response CRC error handling
+ - mmc: sdhci: further fix for DMA unmapping in sdhci_post_req()
+ - mmc: sdhci: avoid unnecessary mapping/unmapping of align buffer
+ - mmc: sdhci: plug DMA mapping leak on error
+ - mmc: sdhci: fix data timeout
+ - [armhf] mmc: tegra: Disable UHS-I modes for tegra114
+ - [armhf] mmc: tegra: properly disable card clock
+ - mmc: sdhci: Fix override of timeout clk wrt max_busy_timeout
+ - [armhf] clk: rockchip: rk3368: fix cpuclk mux bit of big cpu-cluster
+ - [armhf] clk: rockchip: rk3368: fix cpuclk core dividers
+ - [armhf] clk: rockchip: rk3368: fix parents of video encoder/decoder
+ - [armhf] clk: rockchip: rk3368: fix hdmi_cec gate-register
+ - [armhf] clk: rockchip: add hclk_cpubus to the list of rk3188
+ critical clocks
+ - [armhf] clk: bcm2835: Fix setting of PLL divider clock rates
+ - target: Fix target_release_cmd_kref shutdown comp leak
+ - iser-target: Fix identification of login rx descriptor type
+ - iser-target: Separate flows for np listeners and connections cma events
+ - iser-target: Rework connection termination
+ - nfsd4: fix bad bounds checking
+ - nfsd: fix deadlock secinfo+readdir compound
+ - ACPI / PM: Runtime resume devices when waking from hibernate
+ - writeback, cgroup: fix premature wb_put() in
+ locked_inode_to_wb_and_lock_list()
+ - writeback, cgroup: fix use of the wrong bdi_writeback which mismatches
+ the inode
+ - Input: synaptics - handle spurious release of trackstick buttons, again
+ - Input: ati_remote2 - fix crashes on detecting device with invalid
+ descriptor (CVE-2016-2185)
+ - ocfs2: o2hb: fix double free bug
+ - ocfs2/dlm: fix race between convert and recovery
+ - ocfs2/dlm: fix BUG in dlm_move_lockres_to_recovery_list
+ - mm/page_alloc: prevent merging between isolated and other pageblocks
+ - mtd: onenand: fix deadlock in onenand_block_markbad
+ - [x86] intel_idle: prevent SKL-H boot failure when C8+C9+C10 enabled
+ - PM / sleep: Clear pm_suspend_global_flags upon hibernate
+ - scsi_common: do not clobber fixed sense information
+ - sched/cputime: Fix steal time accounting vs. CPU hotplug
+ - [x86] perf/pebs: Add workaround for broken OVFL status on HSW+
+ - [x86] perf/intel/uncore: Remove SBOX support for BDX-DE
+ - [x86] perf/intel: Fix PEBS warning by only restoring active PMU in pmi
+ - [x86] perf/intel: Use PAGE_SIZE for PEBS buffer size on Core2
+ - [x86] perf/intel: Fix PEBS data source interpretation on Nehalem/Westmere
+
+ [ Ben Hutchings ]
+ * mm: exclude ZONE_DEVICE from GFP_ZONE_TABLE
+ * mm: ZONE_DEVICE depends on SPARSEMEM_VMEMMAP
+ * [amd64] Re-enable ZONE_DMA and sound drivers that depend on it
+ (Closes: #814855)
+ * ntfs: Disable NTFS_RW (Closes: #566356); ntfs-3g has much more complete
+ write support
+ * Merge linux-tools source package into linux
+ (Closes: #550379, #573483, #816500)
+ * Add support for securelevel and prepare for Secure Boot (Closes: #820008):
+ - Add Matthew Garrett's securelevel patchset (see
+ Documentation/security/securelevel.txt)
+ - modules: Enable MODULE_SIG and MODULE_SIG_SHA256, but not MODULE_SIG_ALL
+ as signatures will be packaged separately
+ - debian/control: Add build-dependencies on libssl-dev, openssl
+ - debian/copyright: Note that extract-cert and sign-file are under LGPL 2.1
+ - linux-kbuild: Add extract-cert and sign-file programs
+ - scripts: Fix X.509 PEM support in sign-file
+ - certs: Set SYSTEM_TRUSTED_KEYS to my own personal certificate to support
+ initial testing of signed modules
+
+ [ Aurelien Jarno ]
+ * [mipsel/mips/config.loongson-2f] Disable VIDEO_CX23885, VIDEO_IVTV,
+ VIDEO_CX231XX, VIDEO_PVRUSB2 (fixes FTBFS).
+ * [mips*/octeon] Backport OCTEON SATA controller support from 4.6-rc1.
+ Enable AHCI_OCTEON and SATA_AHCI_PLATFORM.
+ * [mips*/octeon] Backport Octeon III CN7xxx interface detection from
+ 4.7 queue.
+ * [mips*/octeon] Enable SPI_OCTEON.
+ * [mips*/octeon] udeb: Add ahci_octeon and ahci_platform modules to
+ sata-modules.
+ * [mips*/octeon] Bump CONFIG_NR_CPUS to 32 to accomodate recent Octeon
+ III SoCs.
+ * [mips*/octeon] Enable CRYPTO_MD5_OCTEON, CRYPTO_SHA1_OCTEON, CRYPTO_SHA256
+ and CRYPTO_SHA512_OCTEON.
+ [ Roger Shimizu ]
+ * [armel/marvell] Change MTD_CFI_AMDSTD from module to built-in
+ because orion5x-based Buffalo Linkstation devices still need it
+ (Closes: #818598)
+ * [armel/marvell] Add DT support for "Synology DS112" and "Zyxel NSA320".
+ Thanks to Heinrich Schuchardt. (Closes: #819393)
+ * [armel/marvell] Add DT support for "Buffalo/Revogear Kurobox Pro"
+ * [armhf/armmp] Enable DW_WATCHDOG as module, used on Firefly-RK3288.
+ Patch by Vagrant Cascadian. (Closes: #820834)
- -- Salvatore Bonaccorso <carnil at debian.org> Thu, 17 Mar 2016 18:19:26 +0100
+ -- Ben Hutchings <ben at decadent.org.uk> Fri, 25 Mar 2016 13:43:57 +0000
+
+linux-tools (4.5-1~exp1) experimental; urgency=medium
+
+ * New upstream release
+
+ [ Ben Hutchings ]
+ * linux-perf: Fix use of uninitialized variables
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 20 Mar 2016 21:20:22 +0000
+
+linux (4.5-1~exp1) experimental; urgency=medium
+
+ * New upstream release: http://kernelnewbies.org/Linux_4.5
+
+ [ Martin Michlmayr ]
+ * [arm64] Enable LEDS_GPIO.
+ * [arm64] Enable more QCOM options. (Closes: #815627)
+ * [arm64] udeb: Add leds-modules package containing leds-gpio driver.
+ * [arm64] udeb: Add regulators and SoC modules to core-modules.
+
+ [ Uwe Kleine-König ]
+ * [armhf] Enable DRM_ETNAVIV.
+
+ [ Ben Hutchings ]
+ * [armel/versatile] Enable GPIOLIB, new dependency of SMC91X (fixes FTBFS)
+ * [x86] input: Enable ASUS_WIRELESS as module (Closes: #818487)
+ * [x86] amdgpu: Enable DRM_AMD_POWERPLAY (Closes: #818174)
+ * [x86] Enable RANDOMIZE_BASE (kASLR). This is incompatible with hibernation,
+ so you must use the kernel parameter "kaslr" to enable kASLR and disable
+ hibernation at boot time. (Closes: #816067)
+ * [x86] vmxnet3: fix lock imbalance in vmxnet3_tq_xmit() (regression in 4.5)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 20 Mar 2016 12:06:57 +0000
+
+linux (4.5~rc7-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 07 Mar 2016 22:20:48 +0000
+
+linux-tools (4.5~rc7-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ [ Ben Hutchings ]
+ * Makefile.inc: Add support for wildcards in $(SCRIPTS) and $(DATA)
+ * linux-kbuild: Include scripts/Makefile.* (Closes: #815593)
+ * Makefile.inc, rules.real: Fix conflation of $(DESTDIR) and $(prefix)
+ * hyperv-daemons: Fix rule redefinition that 'make' warns about
+ * debian/control: Build-Depend on dh-python, as dh_python2 warns we should
+ * lockdep: Add '+' prefix to make invocation, so it can be parallelised
+ * tools/build: Fix 'unused variable' warning in the bpf() feature check
+ * lockdep: Add more missing macros
+
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 07 Mar 2016 03:07:00 +0000
+
+linux-tools (4.5~rc5-1~exp3) experimental; urgency=medium
+
+ * Adjust build fix from unstable
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 21 Feb 2016 23:45:04 +0000
+
+linux-tools (4.5~rc5-1~exp2) experimental; urgency=medium
+
+ * Merge build fix from unstable
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 21 Feb 2016 17:40:52 +0000
+
+linux-tools (4.5~rc5-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ [ Ben Hutchings ]
+ * lockdep: Add missing macros
+ * Adjust VPATH to work for check-hyperv (and simplify the modpost wrapper)
+ * tools/build: Remove bpf() run-time check at build time
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 21 Feb 2016 16:45:52 +0000
+
+linux (4.5~rc5-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ [ Ben Hutchings ]
+ * [armel/versatile] Enable GPIOLIB, needed to build smc91x driver with
+ OF enabled (fixes FTBFS)
+ * [powerpc] mm: Fix HAVE_ARCH_SOFT_DIRTY dependencies (fixes FTBFS)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 21 Feb 2016 13:17:27 +0000
+
+linux (4.5~rc4-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ [ Roger Shimizu ]
+ * Enable TTY_PRINTK as module (Closes: #814540).
+
+ [ Ben Hutchings ]
+ * [rt] Disable until it is updated for 4.5 or later
+ * aufs: Update support patches to aufs4.x-rcN-20160215
+ * Compile with gcc-5 on all architectures
+ * [hppa] Update build-dependencies for renaming of binutils-hppa64
+ * [x86] udeb: Move scsi_transport_fc to scsi-core-modules, since hv_storvsc
+ now depends on it
+
+ -- Ben Hutchings <ben at decadent.org.uk> Thu, 18 Feb 2016 01:57:20 +0000
+
+linux-tools (4.4.6-1) unstable; urgency=medium
+
+ * New upstream stable update:
+ - tools lib traceevent: Fix output of %llu for 64 bit values read on
+ 32 bit machines
+ - perf tools: tracepoint_error() can receive e=NULL, robustify it
+ - perf kvm record/report: 'unprocessable sample' error while
+ recording/reporting guest data
+ - tools: hv: vss: fix the write()'s argument: error -> vss_msg
+ - uapi: update install list after nvme.h rename
+ - perf stat: Do not clean event's private stats
+
+ [ Mattia Dongili ]
+ * Build linux-cpupower.
+
+ [ Ben Hutchings ]
+ * debian/control: Update policy version to 3.9.7; no changes required
+ * linux-perf: Override lintian errors for perf-read-vdso{,x}32 in
+ 64-bit packages
+ * debian/copyright: Move GPL-2 boilerplate to its own paragraph
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 20 Mar 2016 16:23:48 +0000
linux (4.4.6-1) unstable; urgency=medium
diff --cc debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-nsa320.dtb-to-Makefile.patch
index 0000000,c1a160e..db2f045
mode 000000,100644..100644
--- a/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-nsa320.dtb-to-Makefile.patch
+++ b/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-nsa320.dtb-to-Makefile.patch
@@@ -1,0 -1,28 +1,26 @@@
+ From: Heinrich Schuchardt <xypron.glpk at gmx.de>
+ Date: Mon, 28 Mar 2016 10:38:31 +0200
+ Subject: [PATCH 2/2] ARM: dts: kirkwood: add kirkwood-nsa320.dtb to Makefile
+ Origin: http://git.infradead.org/linux-mvebu.git/commitdiff/9ec423ed62b8278412400fae6c064edb6ce1bb51
+
+ Commit be3d7d023b87 ("ARM: kirkwood: Add DTS file for NSA320")
+ created the new file kirkwood-nsa320.dts but did not
+ add it to the Makefile.
+
+ Fixes: be3d7d023b87 ("ARM: kirkwood: Add DTS file for NSA320")
+ Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
+ Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
+ ---
+ arch/arm/boot/dts/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 67d5368..e9083a9 100644
+ --- a/arch/arm/boot/dts/Makefile
+ +++ b/arch/arm/boot/dts/Makefile
-@@ -215,6 +215,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
++@@ -210,6 +210,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
+ kirkwood-ns2mini.dtb \
+ kirkwood-nsa310.dtb \
+ kirkwood-nsa310a.dtb \
+ + kirkwood-nsa320.dtb \
++ kirkwood-nsa325.dtb \
+ kirkwood-openblocks_a6.dtb \
+ kirkwood-openblocks_a7.dtb \
- kirkwood-openrd-base.dtb \
diff --cc debian/patches/features/arm/device-tree/ARM-dts-orion5x-add-device-tree-for-kurobox-pro.patch
index 0000000,37bf1a6..7651873
mode 000000,100644..100644
--- a/debian/patches/features/arm/device-tree/ARM-dts-orion5x-add-device-tree-for-kurobox-pro.patch
+++ b/debian/patches/features/arm/device-tree/ARM-dts-orion5x-add-device-tree-for-kurobox-pro.patch
@@@ -1,0 -1,176 +1,171 @@@
+ From: Roger Shimizu <rogershimizu at gmail.com>
+ Date: Wed, 30 Mar 2016 01:11:45 +0900
+ Subject: [PATCH] ARM: dts: orion5x: add device tree for kurobox-pro
+ Origin: http://git.infradead.org/linux-mvebu.git/commitdiff/452cc94458237d4a26aa1e08f23f57f072368e4e
+
+ Add dts file to support Buffalo/Revogear Kurobox-Pro, which is marvell
+ orion5x based 3.5" HDD NAS.
+
+ It's a quite old product and already discontinued. So there's no
+ official website for it. But it was an early product which used marvell
+ orion5x 88F5182 chipset, it's popular in the community.
+ Some unofficial site:
+ - http://buffalo.nas-central.org/wiki/Category:KuroboxPro
+ - http://nice.kaze.com/KUROPRO_ProductSpecifications.pdf
+
+ This device tree is based on the board file:
+ arch/arm/mach-orion5x/kurobox_pro-setup.c
+ However, the probing order of NAND and JEDEC-Flash are different from
+ the original board file, this results in incompatible minor number
+ for a few /dev/mtdX and /dev/mtdblockX devices.
+ So I still want to keep the board file for the time being.
+
+ Signed-off-by: Roger Shimizu <rogershimizu at gmail.com>
+ Reviewed-by: Andrew Lunn <andrew at lunn.ch>
+ Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
+ ---
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/orion5x-kuroboxpro.dts | 127 +++++++++++++++++++++++++++++++
+ 2 files changed, 128 insertions(+)
+ create mode 100644 arch/arm/boot/dts/orion5x-kuroboxpro.dts
+
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index e9083a9..8ec2874 100644
+ --- a/arch/arm/boot/dts/Makefile
+ +++ b/arch/arm/boot/dts/Makefile
-@@ -497,6 +497,7 @@ dtb-$(CONFIG_SOC_DRA7XX) += \
- am57xx-beagle-x15.dtb \
++@@ -517,6 +517,7 @@ dtb-$(CONFIG_SOC_DRA7XX) += \
++ dra7-evm.dtb \
+ dra72-evm.dtb
+ dtb-$(CONFIG_ARCH_ORION5X) += \
+ + orion5x-kuroboxpro.dtb \
+ orion5x-lacie-d2-network.dtb \
+ orion5x-lacie-ethernet-disk-mini-v2.dtb \
+ orion5x-linkstation-lsgl.dtb \
-diff --git a/arch/arm/boot/dts/orion5x-kuroboxpro.dts b/arch/arm/boot/dts/orion5x-kuroboxpro.dts
-new file mode 100644
-index 0000000..1a672b0
+ --- /dev/null
+ +++ b/arch/arm/boot/dts/orion5x-kuroboxpro.dts
+ @@ -0,0 +1,127 @@
+ +/*
+ + * Device Tree file for Buffalo/Revogear Kurobox Pro
+ + *
+ + * Copyright (C) 2016
+ + * Roger Shimizu <rogershimizu at gmail.com>
+ + *
+ + * Based on the board file arch/arm/mach-orion5x/kurobox_pro-setup.c
+ + * Copyright (C) Ronen Shitrit <rshitrit at marvell.com>
+ + *
+ + * This file is dual-licensed: you can use it either under the terms
+ + * of the GPL or the X11 license, at your option. Note that this dual
+ + * licensing only applies to this file, and not this project as a
+ + * whole.
+ + *
+ + * a) This file is free software; you can redistribute it and/or
+ + * modify it under the terms of the GNU General Public License as
+ + * published by the Free Software Foundation; either version 2 of the
+ + * License, or (at your option) any later version.
+ + *
+ + * This file is distributed in the hope that it will be useful
+ + * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ + * GNU General Public License for more details.
+ + *
+ + * Or, alternatively
+ + *
+ + * b) Permission is hereby granted, free of charge, to any person
+ + * obtaining a copy of this software and associated documentation
+ + * files (the "Software"), to deal in the Software without
+ + * restriction, including without limitation the rights to use
+ + * copy, modify, merge, publish, distribute, sublicense, and/or
+ + * sell copies of the Software, and to permit persons to whom the
+ + * Software is furnished to do so, subject to the following
+ + * conditions:
+ + *
+ + * The above copyright notice and this permission notice shall be
+ + * included in all copies or substantial portions of the Software.
+ + *
+ + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+ + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+ + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ + * OTHER DEALINGS IN THE SOFTWARE.
+ + */
+ +
+ +/dts-v1/;
+ +
+ +#include "orion5x-linkstation.dtsi"
+ +#include <dt-bindings/gpio/gpio.h>
+ +
+ +/ {
+ + model = "Buffalo/Revogear Kurobox Pro";
+ + compatible = "buffalo,kurobox-pro", "marvell,orion5x-88f5182", "marvell,orion5x";
+ +
+ + soc {
+ + ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>,
+ + <MBUS_ID(0x09, 0x00) 0 0xf2200000 0x800>,
+ + <MBUS_ID(0x01, 0x0f) 0 0xf4000000 0x40000>,
+ + <MBUS_ID(0x01, 0x1e) 0 0xfc000000 0x1000000>;
+ + };
+ +
+ + memory { /* 128 MB */
+ + device_type = "memory";
+ + reg = <0x00000000 0x8000000>;
+ + };
+ +};
+ +
+ +&pinctrl {
+ + pmx_power_hdd: pmx-power-hdd {
+ + marvell,pins = "mpp1";
+ + marvell,function = "gpio";
+ + };
+ +
+ + pmx_power_usb: pmx-power-usb {
+ + marvell,pins = "mpp9";
+ + marvell,function = "gpio";
+ + };
+ +};
+ +
+ +&devbus_cs0 {
+ + status = "okay";
+ + compatible = "marvell,orion-nand";
+ + reg = <MBUS_ID(0x01, 0x1e) 0 0x400>;
+ + cle = <0>;
+ + ale = <1>;
+ + bank-width = <1>;
+ +
+ + partitions {
+ + compatible = "fixed-partitions";
+ + #address-cells = <1>;
+ + #size-cells = <1>;
+ +
+ + uImage at 0 { /* 4 MB */
+ + reg = <0 0x400000>;
+ + read-only;
+ + };
+ +
+ + rootfs at 400000 { /* 64 MB */
+ + reg = <0x400000 0x4000000>;
+ + read-only;
+ + };
+ +
+ + extra at 4400000 { /* 188 MB */
+ + reg = <0x4400000 0xBC00000>;
+ + read-only;
+ + };
+ + };
+ +};
+ +
+ +&hdd_power {
+ + gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
+ +};
+ +
+ +&usb_power {
+ + gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
+ +};
+ +
+ +&sata {
+ + nr-ports = <2>;
+ +};
+ +
+ +&ehci1 {
+ + status = "okay";
+ +};
diff --cc debian/patches/series
index dc17cfc,002ed3d..811e0d3
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -62,6 -94,12 +62,9 @@@ features/arm/device-tree/ARM-dts-kirkwo
features/arm/device-tree/ARM-dts-kirkwood-add-for-buffalo-linkstation-ls-qvl.patch
features/arm/device-tree/ARM-dts-orion5x-split-linkstation-lswtgl-into-common-and-.patch
features/arm/device-tree/ARM-dts-orion5x-add-for-buffalo-linkstation-ls-gl.patch
-features/arm/device-tree/ARM-dts-kirkwood-use-unique-machine-name-for-ds112.patch
+ features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-ds112.dtb-to-Makefile.patch
+ features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-nsa320.dtb-to-Makefile.patch
+ features/arm/device-tree/ARM-dts-orion5x-add-device-tree-for-kurobox-pro.patch
-features/arm/novena/ARM-dts-imx6q-add-Novena-board.patch
-features/arm/novena/ARM-dts-imx6q-clean-up-unused-ipu2grp.patch
# Miscellaneous bug fixes
bugfix/all/misc-bmp085-Enable-building-as-a-module.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list