Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbad9b8f authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.4@89074de (v4.4.94) into msm-4.4 



* refs/heads/tmp-89074de6
  Linux 4.4.94
  Revert "tty: goldfish: Fix a parameter of a call to free_irq"
  cpufreq: CPPC: add ACPI_PROCESSOR dependency
  nfsd/callback: Cleanup callback cred on shutdown
  target/iscsi: Fix unsolicited data seq_end_offset calculation
  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
  i2c: at91: ensure state is restored after suspending
  net: mvpp2: release reference to txq_cpu[] entry after unmapping
  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
  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
  iio: adc: xilinx: Fix error handling
  netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.
  net/mlx4_en: fix overflow in mlx4_en_init_timestamp()
  mac80211: fix power saving clients handling in iwlwifi
  mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length
  irqchip/crossbar: Fix incorrect type of local variables
  watchdog: kempld: fix gcc-4.3 build
  locking/lockdep: Add nest_lock integrity test
  Revert "bsg-lib: don't free job in bsg_prepare_job"
  tipc: use only positive error codes in messages
  net: Set sk_prot_creator when cloning sockets to the right proto
  packet: only test po->has_vnet_hdr once in packet_snd
  packet: in packet_do_bind, test fanout with bind_lock held
  tun: bail out from tun_get_user() if the skb is empty
  l2tp: fix race condition in l2tp_tunnel_delete
  l2tp: Avoid schedule while atomic in exit_net
  vti: fix use after free in vti_tunnel_xmit/vti6_tnl_xmit
  isdn/i4l: fetch the ppp_write buffer in one shot
  bpf: one perf event close won't free bpf program attached by another perf event
  packet: hold bind lock when rebinding to fanout hook
  net: emac: Fix napi poll list corruption
  ip6_gre: skb_push ipv6hdr before packing the header in ip6gre_header
  udpv6: Fix the checksum computation when HW checksum does not apply
  bpf/verifier: reject BPF_ALU64|BPF_END
  sctp: potential read out of bounds in sctp_ulpevent_type_enabled()
  MIPS: Fix minimum alignment requirement of IRQ stack
  drm/dp/mst: save vcpi with payloads
  percpu: make this_cpu_generic_read() atomic w.r.t. interrupts
  trace: sched: Fix util_avg_walt in sched_load_avg_cpu trace
  sched/fair: remove erroneous RCU_LOCKDEP_WARN from start_cpu()
  sched: EAS/WALT: finish accounting prior to task_tick
  cpufreq: sched: update capacity request upon tick always
  sched/fair: prevent meaningless active migration
  sched: walt: Leverage existing helper APIs to apply invariance

Conflicts:
	kernel/sched/core.c
	kernel/sched/fair.c
	kernel/sched/sched.h

Change-Id: I0effac90fb6a4db559479bfa2fefa31c41200ce9
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 7ed4cfd8 89074de6

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 93

SUBLEVEL = 94

EXTRAVERSION =

NAME = Blurry Fish Butt

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/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;

arch/sparc/kernel/smp_64.c

+5 −1
Original line number Diff line number Diff line
@@ -1443,8 +1443,12 @@ void smp_send_stop(void) 
	int cpu;



	if (tlb_type == hypervisor) {

		int this_cpu = smp_processor_id();

#ifdef CONFIG_SERIAL_SUNHV

		sunhv_migrate_hvcons_irq(this_cpu);

#endif

		for_each_online_cpu(cpu) {

			if (cpu == smp_processor_id())

			if (cpu == this_cpu)

				continue;

#ifdef CONFIG_SUN_LDOMS

			if (ldom_domaining_enabled) {

block/bsg-lib.c

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ static int bsg_create_job(struct device *dev, struct request *req) 
failjob_rls_rqst_payload:

	kfree(job->request_payload.sg_list);

failjob_rls_job:

	kfree(job);

	return -ENOMEM;

}