linux_dsm_epyc7002/include/linux/mtd
Artem Bityutskiy 7bf7e370d5 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (9356 commits)
  [media] rc: update for bitop name changes
  fs: simplify iget & friends
  fs: pull inode->i_lock up out of writeback_single_inode
  fs: rename inode_lock to inode_hash_lock
  fs: move i_wb_list out from under inode_lock
  fs: move i_sb_list out from under inode_lock
  fs: remove inode_lock from iput_final and prune_icache
  fs: Lock the inode LRU list separately
  fs: factor inode disposal
  fs: protect inode->i_state with inode->i_lock
  lib, arch: add filter argument to show_mem and fix private implementations
  SLUB: Write to per cpu data when allocating it
  slub: Fix debugobjects with lockless fastpath
  autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd()
  autofs4 - remove autofs4_lock
  autofs4 - fix d_manage() return on rcu-walk
  autofs4 - fix autofs4_expire_indirect() traversal
  autofs4 - fix dentry leak in autofs4_expire_direct()
  autofs4 - reinstate last used update on access
  vfs - check non-mountpoint dentry might block in __follow_mount_rcu()
  ...

NOTE!

This merge commit was created to fix compilation error. The block
tree was merged upstream and removed the 'elv_queue_empty()'
function which the new 'mtdswap' driver is using. So a simple
merge of the mtd tree with upstream does not compile. And the
mtd tree has already be published, so re-basing it is not an option.

To fix this unfortunate situation, I had to merge upstream into the
mtd-2.6.git tree without committing, put the fixup patch on top of
this, and then commit this. The result is that we do not have commits
which do not compile.

In other words, this merge commit "merges" 3 things: the MTD tree, the
upstream tree, and the fixup patch.
2011-03-25 17:41:20 +02:00
..
bbm.h mtd: nand: introduce NAND_CREATE_EMPTY_BBT 2010-10-25 00:54:37 +01:00
blktrans.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1 2011-03-25 17:41:20 +02:00
cfi_endian.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
cfi.h mtd: cfi: add support for AMIC flashes (e.g. A29L160AT) 2011-03-11 14:27:01 +00:00
concat.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
doc2000.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
flashchip.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
fsmc.h mtd: FSMC NAND fix obvious speling errors 2010-12-03 16:35:40 +00:00
ftl.h
gen_probe.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
inftl.h mtd: inftl.h: fix spacing errors 2010-10-24 23:27:24 +01:00
latch-addr-flash.h mtd: NOR flash driver for OMAP-L137/AM17x 2011-03-11 14:22:47 +00:00
map.h mtd: Remove obsolete <mtd/compatmac.h> include 2010-08-08 21:19:42 +01:00
mtd.h mtd: add writebufsize field to mtd_info struct 2011-01-06 15:35:50 +00:00
mtdram.h mtd: mtdram.h: checkpatch cleanup 2010-05-10 14:11:30 +01:00
nand_bch.h mtd: nand: add software BCH ECC support 2011-03-11 17:49:08 +00:00
nand_ecc.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
nand-gpio.h
nand.h mtd: nand: add software BCH ECC support 2011-03-11 17:49:08 +00:00
ndfc.h
nftl.h mtd: Update copyright notices 2010-08-08 20:58:20 +01:00
onenand_regs.h OMAP: OneNAND: fix 104MHz support 2011-02-17 15:44:45 -08:00
onenand.h mtd: onenand: add new option to control initial onenand unlocking 2011-03-11 14:22:47 +00:00
partitions.h mtd: fix master device identification for mtd repartition 2010-12-03 16:32:35 +00:00
pfow.h
physmap.h mtd-physmap: add support users can assign the probe type in board files 2010-08-08 12:28:15 +01:00
pismo.h
plat-ram.h
pmc551.h
qinfo.h
sh_flctl.h mtd/nand/sh_flctl: Move function mtd_to_flctl to fix build failure 2010-05-12 23:24:23 +01:00
sharpsl.h
super.h convert get_sb_mtd() users to ->mount() 2010-10-29 04:16:26 -04:00
ubi.h UBI: provide LEB offset information 2011-03-08 10:12:48 +02:00
xip.h