Merge tag 'v4.5-rc3' into patchwork
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 9 Feb 2016 10:56:42 +0000 (08:56 -0200)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 9 Feb 2016 10:56:42 +0000 (08:56 -0200)
Linux 4.5-rc3

* tag 'v4.5-rc3': (644 commits)
  Linux 4.5-rc3
  epoll: restrict EPOLLEXCLUSIVE to POLLIN and POLLOUT
  radix-tree: fix oops after radix_tree_iter_retry
  MAINTAINERS: trim the file triggers for ABI/API
  dax: dirty inode only if required
  thp: make deferred_split_scan() work again
  mm: replace vma_lock_anon_vma with anon_vma_lock_read/write
  ocfs2/dlm: clear refmap bit of recovery lock while doing local recovery cleanup
  um: asm/page.h: remove the pte_high member from struct pte_t
  mm, hugetlb: don't require CMA for runtime gigantic pages
  mm/hugetlb: fix gigantic page initialization/allocation
  mm: downgrade VM_BUG in isolate_lru_page() to warning
  mempolicy: do not try to queue pages from !vma_migratable()
  mm, vmstat: fix wrong WQ sleep when memory reclaim doesn't make any progress
  vmstat: make vmstat_update deferrable
  mm, vmstat: make quiet_vmstat lighter
  mm/Kconfig: correct description of DEFERRED_STRUCT_PAGE_INIT
  memblock: don't mark memblock_phys_mem_size() as __init
  dump_stack: avoid potential deadlocks
  mm: validate_mm browse_rb SMP race condition
  ...

1  2 
MAINTAINERS
drivers/media/dvb-frontends/tda1004x.c
drivers/media/platform/Kconfig
drivers/media/platform/exynos4-is/media-dev.c
drivers/media/v4l2-core/videobuf2-core.c

diff --cc MAINTAINERS
Simple merge
index 3137a9ba3a3224da9da5cbb6b91ded5e141b8fcf,c6abeb4fba9db51827fc815fde920b1a30faa1fa..b89848313fb9c203d62a64ad0119c37956b68bea
@@@ -899,10 -899,11 +899,11 @@@ static int tda1004x_set_fe(struct dvb_f
        return 0;
  }
  
 -static int tda1004x_get_fe(struct dvb_frontend *fe)
 +static int tda1004x_get_fe(struct dvb_frontend *fe,
 +                         struct dtv_frontend_properties *fe_params)
  {
 -      struct dtv_frontend_properties *fe_params = &fe->dtv_property_cache;
        struct tda1004x_state* state = fe->demodulator_priv;
+       int status;
  
        dprintk("%s\n", __func__);
  
Simple merge