Code

april 19 merge#1

Code

Merged

baoruxing merged 50 commits intobaoruxing:masterbaoruxing/linux:masterfrom torvalds:mastertorvalds/linux:masterCopy head branch name to clipboardApr 19, 2013

+297-190

Commits

Commits on Mar 15, 2013

• intel_idle: additional Haswell CPU-id

  Show description for 0b15841
  lenb

  committed
  0b15841

  Copy full SHA for 0b15841

• tools/power turbostat: additional Haswell CPU-id

  Show description for 149c231
  lenb

  committed
  149c231

  Copy full SHA for 149c231

Commits on Apr 6, 2013

• netfilter: nf_ct_sip: don't drop packets with offsets pointing outside the packet

  Show description for 3a7b21e
  

  kaber

  authored and

  ummakynes

  committed
  3a7b21e

  Copy full SHA for 3a7b21e

Commits on Apr 9, 2013

• netfilter: ipset: list:set: fix reference counter update

  Show description for 02f815c
  

  Jozsef Kadlecsik

  authored and

  ummakynes

  committed
  02f815c

  Copy full SHA for 02f815c

• netfilter: ipset: hash:*net*: nomatch flag not excluded on set resize

  Show description for 6eb4c7e
  

  Jozsef Kadlecsik

  authored and

  ummakynes

  committed
  6eb4c7e

  Copy full SHA for 6eb4c7e

Commits on Apr 11, 2013

• tcp: incoming connections might use wrong route under synflood

  Show description for d66954a
  

  Dmitry Popov

  authored and

  davem330

  committed
  d66954a

  Copy full SHA for d66954a

• bonding: fix netdev event NULL pointer dereference

  Show description for 6101391
  

  nikolay@redhat.com

  authored and

  davem330

  committed
  6101391

  Copy full SHA for 6101391

• bonding: IFF_BONDING is not stripped on enslave failure

  Show description for b6a5a7b
  

  nikolay@redhat.com

  authored and

  davem330

  committed
  b6a5a7b

  Copy full SHA for b6a5a7b

• stmmac: prevent interrupt loop with MMC RX IPC Counter

  Show description for 7078b98
  

  Christian Ruppert

  authored and

  davem330

  committed
  7078b98

  Copy full SHA for 7078b98

• tcp: Reallocate headroom if it would overflow csum_start

  Show description for 50bceae
  

  tgraf

  authored and

  davem330

  committed
  50bceae

  Copy full SHA for 50bceae

Commits on Apr 12, 2013

• netfilter: nf_nat: fix race when unloading protocol modules

  Show description for c2d421e
  

  Florian Westphal

  authored and

  ummakynes

  committed
  c2d421e

  Copy full SHA for c2d421e

• can: mcp251x: add missing IRQF_ONESHOT to request_threaded_irq

  Show description for db388d6
  marckleinebudde

  committed
  db388d6

  Copy full SHA for db388d6

• can: sja1000: fix handling on dt properties on little endian systems

  Show description for 0443de5
  

  ch-f

  authored and

  marckleinebudde

  committed
  0443de5

  Copy full SHA for 0443de5

• Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf into netfilter

  Show description for 8b5b8c2
  davem330

  committed
  8b5b8c2

  Copy full SHA for 8b5b8c2

• Merge branch 'fixes-for-3.9' of git://gitorious.org/linux-can/linux-can

  Show description for d900d12
  davem330

  committed
  d900d12

  Copy full SHA for d900d12

• be2net: take care of __vlan_put_tag return value

  Show description for f11a869
  

  Ivan Vecera

  authored and

  davem330

  committed
  f11a869

  Copy full SHA for f11a869

• tuntap: fix error return code in tun_set_iff()

  Show description for 3be8fba
  

  Wei Yongjun

  authored and

  davem330

  committed
  3be8fba

  Copy full SHA for 3be8fba

• net/802/mrp: fix possible race condition when calling mrp_pdu_queue()

  Show description for fb745e9
  

  dpward

  authored and

  davem330

  committed
  fb745e9

  Copy full SHA for fb745e9

Commits on Apr 13, 2013

• net: mvmdio: add select PHYLIB

  Show description for 2e0cbf2
  

  tpetazzoni

  authored and

  davem330

  committed
  2e0cbf2

  Copy full SHA for 2e0cbf2

Commits on Apr 14, 2013

• ipv6: statically link register_inet6addr_notifier()

  Show description for f88c91d
  

  Cong Wang

  authored and

  davem330

  committed
  f88c91d

  Copy full SHA for f88c91d

Commits on Apr 15, 2013

• bridge: make user modified path cost sticky

  Show description for 8f3359b
  

  shemminger

  authored and

  davem330

  committed
  8f3359b

  Copy full SHA for 8f3359b

• esp4: fix error return code in esp_output()

  Show description for 06848c1
  

  Wei Yongjun

  authored and

  davem330

  committed
  06848c1

  Copy full SHA for 06848c1

• net: mvneta: fix improper tx queue usage in mvneta_tx()

  Show description for ee40a11
  

  wtarreau

  authored and

  davem330

  committed
  ee40a11

  Copy full SHA for ee40a11

• drivers: net: ethernet: cpsw: get slave VLAN id from slave node instead of cpsw node

  Show description for 91c4166
  

  mugunthanvnm

  authored and

  davem330

  committed
  91c4166

  Copy full SHA for 91c4166

Commits on Apr 16, 2013

• net: cdc_mbim: remove bogus sizeof()

  Show description for 32b161a
  

  bmork

  authored and

  davem330

  committed
  32b161a

  Copy full SHA for 32b161a

• net: fec: fix regression in link change accounting

  Show description for 8d7ed0f
  

  lynxeye-dev

  authored and

  davem330

  committed
  8d7ed0f

  Copy full SHA for 8d7ed0f

Commits on Apr 17, 2013

• net: drop dst before queueing fragments

  Show description for 97599dc
  

  Eric Dumazet

  authored and

  davem330

  committed
  97599dc

  Copy full SHA for 97599dc

• qlcnic: fix beaconing test for 82xx adapter

  Show description for 361cd29
  

  Himanshu Madhani

  authored and

  davem330

  committed
  361cd29

  Copy full SHA for 361cd29

• s390: move dummy io_remap_pfn_range() to asm/pgtable.h

  Show description for 4f2e290
  torvalds

  committed
  4f2e290

  Copy full SHA for 4f2e290

• Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

  Show description for fca8316
  torvalds

  committed
  fca8316

  Copy full SHA for fca8316

• rbd: do a safe list traversal in rbd_img_request_submit()

  Show description for 46faeed
  

  Alex Elder

  authored and

  Sage Weil

  committed
  46faeed

  Copy full SHA for 46faeed

• ARM: KVM: fix unbalanced get_cpu() in access_dcsw

  Show description for 15bbc1b
  

  Marc Zyngier

  authored and

  torvalds

  committed
  15bbc1b

  Copy full SHA for 15bbc1b

• Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

  Show description for 96d8683
  torvalds

  committed
  96d8683

  Copy full SHA for 96d8683

• thinkpad-acpi: kill hotkey_thread_mutex

  Show description for 355f1ec
  

  oleg-nesterov

  authored and

  torvalds

  committed
  355f1ec

  Copy full SHA for 355f1ec

• drivers/video/mmp/core.c: fix use-after-free bug

  Show description for d875cf0
  

  andreiepure

  authored and

  torvalds

  committed
  d875cf0

  Copy full SHA for d875cf0

• checkpatch: fix stringification macro defect

  Show description for e942e2c
  

  JoePerches

  authored and

  torvalds

  committed
  e942e2c

  Copy full SHA for e942e2c

• hugetlbfs: stop setting VM_DONTDUMP in initializing vma(VM_HUGETLB)

  Show description for a2fce91
  

  Naoya Horiguchi

  authored and

  torvalds

  committed
  a2fce91

  Copy full SHA for a2fce91

• fs/binfmt_elf.c: fix hugetlb memory check in vma_dump_size()

  Show description for 23d9e48
  

  Naoya Horiguchi

  authored and

  torvalds

  committed
  23d9e48

  Copy full SHA for 23d9e48

• hugetlbfs: add swap entry check in follow_hugetlb_page()

  Show description for 9cc3a5b
  

  Naoya Horiguchi

  authored and

  torvalds

  committed
  9cc3a5b

  Copy full SHA for 9cc3a5b

• avr32: fix build error in atstk1006_defconfig

  Show description for 472d326
  

  JoshWu

  authored and

  torvalds

  committed
  472d326

  Copy full SHA for 472d326

• hfsplus: fix potential overflow in hfsplus_file_truncate()

  Show description for 12f267a
  

  dubeyko

  authored and

  torvalds

  committed
  12f267a

  Copy full SHA for 12f267a

• mm/vmscan: fix error return in kswapd_run()

  Show description for d72515b
  

  Xishi Qiu

  authored and

  torvalds

  committed
  d72515b

  Copy full SHA for d72515b

• kernel/signal.c: stop info leak via the tkill and the tgkill syscalls

  Show description for b9e146d
  

  ephox-gcc-plugins

  authored and

  torvalds

  committed
  b9e146d

  Copy full SHA for b9e146d

• Merge branch 'akpm' (fixes from Andrew)

  Show description for 1ce6ec9
  torvalds

  committed
  1ce6ec9

  Copy full SHA for 1ce6ec9

• Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

  Show description for ebe8054
  torvalds

  committed
  ebe8054

  Copy full SHA for ebe8054

Commits on Apr 18, 2013

• dmaengine: at_hdmac: fix race condition in atc_advance_work()

  Show description for d202f05
  

  ldesroches

  authored and

  torvalds

  committed
  d202f05

  Copy full SHA for d202f05

• kprobes: Fix a double lock bug of kprobe_mutex

  Show description for 5c51543
  

  mhiramathitachi

  authored and

  torvalds

  committed
  5c51543

  Copy full SHA for 5c51543

• Revert "block: add missing block_bio_complete() tracepoint"

  Show description for 0a82a8d
  torvalds

  committed
  0a82a8d

  Copy full SHA for 0a82a8d

• Revert "hp-wmi: Add support for SMBus hotkeys"

  Show description for c857b7f
  

  Matthew Garrett

  committed
  c857b7f

  Copy full SHA for c857b7f

• Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

  Show description for a86d526
  torvalds

  committed
  a86d526

  Copy full SHA for a86d526