Commit aac1cbd0 authored Oct 23, 2017 by Kyle Yan

Merge remote-tracking branch '4.9/tmp-fd67b2f5' into msm-4.9



* 4.9/tmp-fd67b2f5:
  Linux 4.9.58
  usb: dwc3: gadget: Correct ISOC DATA PIDs for short packets
  cpufreq: CPPC: add ACPI_PROCESSOR dependency
  EDAC, mce_amd: Print IPID and Syndrome on a separate line
  btmrvl: avoid double-disable_irq() race
  regulator: core: Resolve supplies before disabling unused regulators
  drm/nouveau/gr/gf100-: fix ccache error logging
  powerpc/perf: Add restrictions to PMC5 in power9 DD1
  nfsd/callback: Cleanup callback cred on shutdown
  hrtimer: Catch invalid clockids again
  target/iscsi: Fix unsolicited data seq_end_offset calculation
  IB/hfi1: Allocate context data on memory node
  IB/hfi1: Use static CTLE with Preset 6 for integrated HFIs
  uapi: fix linux/mroute6.h userspace compilation errors
  uapi: fix linux/rds.h userspace compilation errors
  ceph: clean up unsafe d_parent accesses in build_dentry_path
  ceph: fix bogus endianness change in ceph_ioctl_set_layout
  ceph: don't update_dentry_lease unless we actually got one
  i2c: at91: ensure state is restored after suspending
  qed: Read queue state before releasing buffer
  qed: Reserve doorbell BAR space for present CPUs
  qede: Prevent index problems in loopback test
  net: mvpp2: release reference to txq_cpu[] entry after unmapping
  drm/amdgpu: refuse to reserve io mem for split VRAM buffers
  ASoC: mediatek: add I2C dependency for CS42XX8
  scsi: scsi_dh_emc: return success in clariion_std_inquiry()
  slub: do not merge cache if slub_debug contains a never-merge flag
  ocfs2/dlmglue: prepare tracking logic to avoid recursive cluster lock
  mm/memory_hotplug: set magic number to page->freelist instead of page->lru.next
  crypto: xts - Add ECB dependency
  net/mlx4_core: Fix VF overwrite of module param which disables DMFS on new probed PFs
  sparc64: Migrate hvcons irq to panicked cpu
  md/linear: shutup lockdep warnning
  f2fs: do not wait for writeback in write_begin
  Btrfs: send, fix failure to rename top level inode due to name collision
  sched/fair: Update rq clock before changing a task's CPU affinity
  f2fs: do SSR for data when there is enough free space
  iio: adc: xilinx: Fix error handling
  netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.
  staging: vchiq_2835_arm: Make cache-line-size a required DT property
  net/mlx4_en: fix overflow in mlx4_en_init_timestamp()
  mac80211: fix power saving clients handling in iwlwifi
  qed: Don't use attention PTT for configuring BW
  ALSA: hda: Add Geminilake HDMI codec ID
  mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length
  initramfs: finish fput() before accessing any binary from initramfs
  irqchip/crossbar: Fix incorrect type of local variables
  watchdog: kempld: fix gcc-4.3 build
  locking/lockdep: Add nest_lock integrity test
  xen-netback: Use GFP_ATOMIC to allocate hash
  Revert "bsg-lib: don't free job in bsg_prepare_job"
  MIPS: Fix minimum alignment requirement of IRQ stack

Change-Id: I69d2e97df2f9c12da893aa57c6ebe748724edcf7
Signed-off-by: Kyle Yan <kyan@codeaurora.org>

parents a88270f5 fd67b2f5

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 57
		SUBLEVEL = 58
		EXTRAVERSION =
		NAME = Roaring Lionus

arch/mips/include/asm/irq.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		#include <irq.h>

		#define IRQ_STACK_SIZE THREAD_SIZE
		#define IRQ_STACK_START (IRQ_STACK_SIZE - sizeof(unsigned long))
		#define IRQ_STACK_START (IRQ_STACK_SIZE - 16)

		extern void *irq_stack[NR_CPUS];

arch/powerpc/perf/isa207-common.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -201,6 +201,10 @@
		CNST_PMC_VAL(1) \| CNST_PMC_VAL(2) \| CNST_PMC_VAL(3) \| \
		CNST_PMC_VAL(4) \| CNST_PMC_VAL(5) \| CNST_PMC_VAL(6) \| CNST_NC_VAL

		/*
		* Lets restrict use of PMC5 for instruction counting.
		*/
		#define P9_DD1_TEST_ADDER (ISA207_TEST_ADDER \| CNST_PMC_VAL(5))

		/* Bits in MMCR1 for PowerISA v2.07 */
		#define MMCR1_UNIT_SHIFT(pmc) (60 - (4 * ((pmc) - 1)))

arch/powerpc/perf/power9-pmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -295,7 +295,7 @@ static struct power_pmu power9_pmu = {
		.name = "POWER9",
		.n_counter = MAX_PMU_COUNTERS,
		.add_fields = ISA207_ADD_FIELDS,
		.test_adder = ISA207_TEST_ADDER,
		.test_adder = P9_DD1_TEST_ADDER,
		.compute_mmcr = isa207_compute_mmcr,
		.config_bhrb = power9_config_bhrb,
		.bhrb_filter_map = power9_bhrb_filter_map,

arch/sparc/include/asm/setup.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -59,8 +59,11 @@ extern atomic_t dcpage_flushes;
		extern atomic_t dcpage_flushes_xcall;

		extern int sysctl_tsb_ratio;
		#endif

		#ifdef CONFIG_SERIAL_SUNHV
		void sunhv_migrate_hvcons_irq(int cpu);
		#endif
		#endif
		void sun_do_break(void);
		extern int stop_a_enabled;
		extern int scons_pwroff;